Skip to main content

Browse the archive

swh:1:snp:87728f882295b5ba27035837248a04c5be121c53
Revision b77b02785d2f589ca336fc449ee1c27837263dac authored by Paul Mackerras on 06 February 2006, 22:13:52 UTC, committed by Paul Mackerras on 06 February 2006, 22:13:52 UTC 
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>
1 parent 418c4c7
History
Tip revision: 6c40894d2466d4e7fddc047a05116aa9d14712ee authored by Junio C Hamano on 30 August 2021, 23:06:22 UTC
The second batch
Tip revision: 6c40894
File Mode Size
gitk -rwxr-xr-x 102.1 KB
back to top