Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'rs/diff-postimage-in-context'
author
Junio C Hamano
<gitster@pobox.com>
Sun, 29 Jan 2012 21:18:55 +0000
(13:18 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 29 Jan 2012 21:18:55 +0000
(13:18 -0800)
* rs/diff-postimage-in-context:
xdiff: print post-image for common records instead of pre-image
1
2
xdiff/xemit.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
d1afa8b
baf5aaa
)
diff --cc
xdiff/xemit.c
Simple merge