5 years ago 70ac5f8404 Stefan Sperling
more init fixes for ref lists in tog
5 years ago a55555f2c7 Stefan Sperling
ensure that ref list is always initialized in tog's cmd_log()
5 years ago a129376b6f Stefan Sperling
add initial implementation of 'got revert'
5 years ago 95edb37e3f Stefan Sperling
add missing error string for GOT_ERR_FILE_OBSTRUCTED
5 years ago 66b11bf55a Stefan Sperling
add a test for wt rm vs repo rm
5 years ago fc6346c42a Stefan Sperling
don't leave file as unversioned in case of wt edit vs repo rm
5 years ago 13d9040b96 Stefan Sperling
test and improve behaviour for wt edit vs repo rm conflict
5 years ago 085d5bcf0b Stefan Sperling
use a better naming scheme for tree conflict tests
5 years ago 708d8e672e Stefan Sperling
fix behaviour when update deletes an edited file
5 years ago e9b3576faf Stefan Sperling
document when tog(1) uses split-screen views
5 years ago 9419758ad1 Stefan Sperling
markup fix in tog(1) man page
5 years ago 95adcdcaec Stefan Sperling
add some diff tests
5 years ago 7154f6ce06 Stefan Sperling
make 'got status' detect and indicate merge conflict markers
5 years ago 01a4495616 Stefan Sperling
declare conflict marker strings in got_lib_diff.h
5 years ago 3165301c5a Stefan Sperling
test conflict resolution in test_update_conflict_add_vs_add
