Commit Briefs

Stefan Sperling

add missing error string for GOT_ERR_FILE_OBSTRUCTED

diff | patch | tree

Stefan Sperling

add a test for wt rm vs repo rm

diff | patch | tree

Stefan Sperling

don't leave file as unversioned in case of wt edit vs repo rm

diff | patch | tree

Stefan Sperling

test and improve behaviour for wt edit vs repo rm conflict

diff | patch | tree

Stefan Sperling

use a better naming scheme for tree conflict tests

diff | patch | tree

Stefan Sperling

fix behaviour when update deletes an edited file

diff | patch | tree

Stefan Sperling

document when tog(1) uses split-screen views

diff | patch | tree

Stefan Sperling

markup fix in tog(1) man page

diff | patch | tree

Stefan Sperling

add some diff tests

diff | patch | tree

Stefan Sperling

make 'got status' detect and indicate merge conflict markers

diff | patch | tree

Stefan Sperling

declare conflict marker strings in got_lib_diff.h

diff | patch | tree

Stefan Sperling

test conflict resolution in test_update_conflict_add_vs_add

diff | patch | tree

Stefan Sperling

treat 'add vs add' on update as a text conflict for now

diff | patch | tree

Stefan Sperling

missing error return in test_double_add

diff | patch | tree

Stefan Sperling

fix behaviour when 'got rm' is used twice

diff | patch | tree