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)
commit86e15ff...fe9924b73af32d1bebe77eb5592b93cd
tree4f8f2fe...aa3a3461e29e04c440394f5777b0b5a4copy hash to clipboard (tree)
parentd1afa8b...a271fe0df1a15a6800f23f972abc5293copy hash to clipboard (diff)
parentbaf5aaa...3383af656a34b7ba9039e9eb3c9e678ccopy hash to clipboard (diff)
xdiff/xemit.c