From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 29 Jan 2012 21:18:55 +0000 (-0800)
Subject: Merge branch 'rs/diff-postimage-in-context'
X-Git-Tag: v1.7.10-rc0~137
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86e15ff4fe9924b73af32d1bebe77eb5592b93cd;p=thirdparty%2Fgit.git

Merge branch 'rs/diff-postimage-in-context'

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

86e15ff4fe9924b73af32d1bebe77eb5592b93cd