summaryrefslogtreecommitdiffstats
path: root/t/t4113-apply-ending.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-13 19:41:24 +0200
committerJunio C Hamano <gitster@pobox.com>2011-05-13 19:41:24 +0200
commit4bdbfb15b2d2ad1fbe144dcde386e71bcdff91d0 (patch)
treedc900dc97023bbdaef3241548d063c49a2332589 /t/t4113-apply-ending.sh
parentt5400: Fix a couple of typos (diff)
parentdiffcore-rename: don't consider unmerged path as source (diff)
downloadgit-4bdbfb15b2d2ad1fbe144dcde386e71bcdff91d0.tar.xz
git-4bdbfb15b2d2ad1fbe144dcde386e71bcdff91d0.zip
Merge branch 'mz/maint-rename-unmerged' into maint
* mz/maint-rename-unmerged: diffcore-rename: don't consider unmerged path as source
Diffstat (limited to 't/t4113-apply-ending.sh')
0 files changed, 0 insertions, 0 deletions