summaryrefslogtreecommitdiff
path: root/xdiff/xdiffi.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-01-18 21:18:41 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-18 21:18:41 -0800
commit18d97f5fedc4e464fa9b5d8096b5a9f7e42364fa (patch)
tree0bbfb740677e5318e2828ff6a7df9f48e78ea39d /xdiff/xdiffi.c
parentrebase -i: more graceful handling of invalid commands (diff)
parentFix mis-backport of t7002 (diff)
downloadtgif-18d97f5fedc4e464fa9b5d8096b5a9f7e42364fa.tar.xz
Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4
* commit 'v1.6.4.4-8-g8de6518': Fix mis-backport of t7002
Diffstat (limited to 'xdiff/xdiffi.c')
0 files changed, 0 insertions, 0 deletions