summaryrefslogtreecommitdiff
path: root/xdiff/xtypes.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-01-15 18:52:35 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-15 18:52:35 -0800
commit7bbd8d6c139f163ee26b8416cd227408888f31c3 (patch)
treea6d417bf52c25913b916bf0b3493a8a06813ac11 /xdiff/xtypes.h
parentbash-completion: Add comments to remind about required arguments (diff)
parentMerge branch 'maint-1.6.0' into maint (diff)
downloadtgif-7bbd8d6c139f163ee26b8416cd227408888f31c3.tar.xz
Merge branch 'maint'
* maint: t3404: Add test case for auto-amending only edited commits after "edit" t3404: Add test case for aborted --continue after "edit" t3501: check that commits are actually done
Diffstat (limited to 'xdiff/xtypes.h')
0 files changed, 0 insertions, 0 deletions