summaryrefslogtreecommitdiff
path: root/t/t4009-diff-rename-4.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-01-13 01:15:19 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-13 01:15:19 -0800
commit94468bc1f719b7e0009ec0600b178dd5f412d702 (patch)
treed575fed066ab542840be3ec793fb523491e16677 /t/t4009-diff-rename-4.sh
parentMerge branch 'cb/maint-merge-recursive-fix' into maint (diff)
parentmerge-recursive: mark rename/delete conflict as unmerged (diff)
downloadtgif-94468bc1f719b7e0009ec0600b178dd5f412d702.tar.xz
Merge branch 'js/maint-merge-recursive-r-d-conflict' into maint
* js/maint-merge-recursive-r-d-conflict: merge-recursive: mark rename/delete conflict as unmerged
Diffstat (limited to 't/t4009-diff-rename-4.sh')
0 files changed, 0 insertions, 0 deletions