Merge branch 'rs/diff-postimage-in-context'
authorJunio C Hamano <gitster@pobox.com>
Sun, 29 Jan 2012 21:18:55 +0000 (13:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 29 Jan 2012 21:18:55 +0000 (13:18 -0800)
commit86e15ff4fe9924b73af32d1bebe77eb5592b93cd
tree4f8f2fe9aa3a3461e29e04c440394f5777b0b5a4
parentd1afa8baa271fe0df1a15a6800f23f972abc5293
parentbaf5aaa33383af656a34b7ba9039e9eb3c9e678c
Merge branch 'rs/diff-postimage-in-context'

* rs/diff-postimage-in-context:
  xdiff: print post-image for common records instead of pre-image
xdiff/xemit.c