Code

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)
* rs/diff-postimage-in-context:
  xdiff: print post-image for common records instead of pre-image

1  2 
xdiff/xemit.c

diff --cc xdiff/xemit.c
Simple merge