Commits

Commit:
9627c110bee81b5d7368441eaf4e661010ba9cd5
From:
Stefan Sperling <stsp@stsp.name>
Date:
show a summary of conflicts and related problems after updating/merging files ok millert@
diff | patch | tree
Commit:
562580bce8d701d318471fe7601bc614a00c94ef
From:
Stefan Sperling <stsp@stsp.name>
Date:
support Git-style "lightweight" tags as arguments for 'got diff'
diff | patch | tree
Commit:
f69721c3fc6f5a7b7a11a49a1fd7a99182ef01f0
From:
Stefan Sperling <stsp@stsp.name>
Date:
show base commit hash and omit filenames in conflict markers
diff | patch | tree
Commit:
46f68b205b4ab514846c5352c6d952720b9da365
From:
Stefan Sperling <stsp@stsp.name>
Date:
show file mode differences when diffing trees
diff | patch | tree
Commit:
d136cfcb987bd2fd865f8711449dc47b7f63455f
From:
Stefan Sperling <stsp@stsp.name>
Date:
show original file content in conflict markers
diff | patch | tree
Commit:
63035f9f4ff2f4ea5b7361830edad916a30e37cd
From:
Stefan Sperling <stsp@stsp.name>
Date:
add -w (ignore whitespace) option to 'got diff'
diff | patch | tree
Commit:
2a06fe5f59f1b7b42f63bd9afe5187935c341321
From:
Stefan Sperling <stsp@stsp.name>
Date:
indicate non-existent paths in 'got status' and make 'got diff' error for them
diff | patch | tree
Commit:
d24820bf831196d55a112663501e8e67ac79911c
From:
Stefan Sperling <stsp@stsp.name>
Date:
add support for tag objects to 'got diff'
diff | patch | tree
Commit:
8d301dd94ca3964729aa83b8031e7502a1111f49
From:
Stefan Sperling <stsp@stsp.name>
Date:
use cmp -s, instead of cmp, in all command line tests
diff | patch | tree
Commit:
95adcdcaec7617831087917a2967c0cc475860bc
From:
Stefan Sperling <stsp@stsp.name>
Date:
add some diff tests
diff | patch | tree