diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-05-13 10:41:24 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-05-13 10:41:24 -0700 |
commit | 4bdbfb15b2d2ad1fbe144dcde386e71bcdff91d0 (patch) | |
tree | dc900dc97023bbdaef3241548d063c49a2332589 /diff.h | |
parent | ebe8621fd798a568ae33eb6a665cb3c758dd3816 (diff) | |
parent | d7c9bf22351e39756f93f09b4251a6b5861d9cc0 (diff) | |
download | git-4bdbfb15b2d2ad1fbe144dcde386e71bcdff91d0.tar.gz git-4bdbfb15b2d2ad1fbe144dcde386e71bcdff91d0.tar.xz |
Merge branch 'mz/maint-rename-unmerged' into maint
* mz/maint-rename-unmerged:
diffcore-rename: don't consider unmerged path as source
Diffstat (limited to 'diff.h')
0 files changed, 0 insertions, 0 deletions