5 years ago Stefan Sperling
don't leave file as unversioned in case of wt edit vs repo rm
test and improve behaviour for wt edit vs repo rm conflict
use a better naming scheme for tree conflict tests
fix behaviour when update deletes an edited file
document when tog(1) uses split-screen views
markup fix in tog(1) man page
add some diff tests
make 'got status' detect and indicate merge conflict markers
declare conflict marker strings in got_lib_diff.h
test conflict resolution in test_update_conflict_add_vs_add
treat 'add vs add' on update as a text conflict for now
missing error return in test_double_add
fix behaviour when 'got rm' is used twice
fix behaviour when 'got add' is used twice
mention bare repos in git-repository(5), not got(1)
