diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-06 22:13:52 (GMT) |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-06 22:13:52 (GMT) |
| commit | b77b02785d2f589ca336fc449ee1c27837263dac (patch) | |
| tree | 2ce554795b608653c0ce262477e3da49e34afd22 /Documentation | |
| parent | 418c4c7bceb7276e2a95772aa34f0cee5e1c47e8 (diff) | |
| download | git-b77b02785d2f589ca336fc449ee1c27837263dac.zip git-b77b02785d2f589ca336fc449ee1c27837263dac.tar.gz git-b77b02785d2f589ca336fc449ee1c27837263dac.tar.bz2 | |
gitk: Use git-diff-tree --cc for showing the diffs for merges
This replaces a lot of code that used the result from several 2-way
diffs to generate a combined diff for a merge. Now we just use
git-diff-tree --cc and colorize the output a bit, which is a lot
simpler, and has the enormous advantage that if the diff doesn't
show quite what someone thinks it should show, I can deflect the
blame to someone else. :)
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions