summaryrefslogtreecommitdiff
path: root/userdiff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-13 17:41:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-13 17:41:24 (GMT)
commit4bdbfb15b2d2ad1fbe144dcde386e71bcdff91d0 (patch)
treedc900dc97023bbdaef3241548d063c49a2332589 /userdiff.h
parentebe8621fd798a568ae33eb6a665cb3c758dd3816 (diff)
parentd7c9bf22351e39756f93f09b4251a6b5861d9cc0 (diff)
downloadgit-4bdbfb15b2d2ad1fbe144dcde386e71bcdff91d0.zip
git-4bdbfb15b2d2ad1fbe144dcde386e71bcdff91d0.tar.gz
git-4bdbfb15b2d2ad1fbe144dcde386e71bcdff91d0.tar.bz2
Merge branch 'mz/maint-rename-unmerged' into maint
* mz/maint-rename-unmerged: diffcore-rename: don't consider unmerged path as source
Diffstat (limited to 'userdiff.h')
0 files changed, 0 insertions, 0 deletions