Commits


regress: fix test failures using ln(1) GNU ln uses -T instead of -h for no-target-directory. OK thomas.adam


make 'got update' display the worktree's branch name upon success ok tracey


use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA


replace echo with printf, stop option processing with "--" for portability ok stsp


consistently label removed files as "/dev/null" in diff headers


handle binary files in got/tog diff commands; add -a options to force text


add a test for diffing binary files; got diff behaves like 'diff -a'


switch function declarations from Korn shell to Bourne/POSIX shell syntax ok stsp


add a -q option to tests for quiet output and use it for 'make regress' Previous default output remains when test cases are run individually. ok tracey


add support for symlinks in the repository to 'got diff'


fix symlink change in test_diff_symlinks_in_work_tree


make 'got diff' show changes to symlinks in a work tree


add submodule tests ok semarie


show a summary of conflicts and related problems after updating/merging files ok millert@


support Git-style "lightweight" tags as arguments for 'got diff'


show base commit hash and omit filenames in conflict markers


show file mode differences when diffing trees


show original file content in conflict markers


add -w (ignore whitespace) option to 'got diff'


indicate non-existent paths in 'got status' and make 'got diff' error for them


add support for tag objects to 'got diff'


use cmp -s, instead of cmp, in all command line tests


add some diff tests