Commits


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)


more wording tweaks in git-repository(5)


fix documentation of .git/branches/ directory


wording tweak in got(1) man page


mark-up tweak in got(1) man page


remove mission statement from got(1) man page


typo in got(1) man page


document the new A and D status codes for 'got status'


typos and wording fixes in git-repository(5)