aboutsummaryrefslogtreecommitdiff
path: root/t/t6026-merge-attr.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-01-29 13:18:55 -0800
committerJunio C Hamano <gitster@pobox.com>2012-01-29 13:18:55 -0800
commit86e15ff4fe9924b73af32d1bebe77eb5592b93cd (patch)
tree4f8f2fe9aa3a3461e29e04c440394f5777b0b5a4 /t/t6026-merge-attr.sh
parentd1afa8baa271fe0df1a15a6800f23f972abc5293 (diff)
parentbaf5aaa33383af656a34b7ba9039e9eb3c9e678c (diff)
downloadgit-86e15ff4fe9924b73af32d1bebe77eb5592b93cd.tar.gz
git-86e15ff4fe9924b73af32d1bebe77eb5592b93cd.tar.xz
Merge branch 'rs/diff-postimage-in-context'
* rs/diff-postimage-in-context: xdiff: print post-image for common records instead of pre-image
Diffstat (limited to 't/t6026-merge-attr.sh')
0 files changed, 0 insertions, 0 deletions