summaryrefslogtreecommitdiff
path: root/userdiff.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-02 15:58:27 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-02 15:58:27 -0700
commit2db8926236406a4e4cb17d1b9c4b791706fb0512 (patch)
tree2156bd237ac11f679bbc3bb9e085cae81d12e441 /userdiff.h
parentUpdate draft release notes to 1.7.6 (diff)
parentdiffcore-rename: don't consider unmerged path as source (diff)
downloadtgif-2db8926236406a4e4cb17d1b9c4b791706fb0512.tar.xz
Merge branch 'mz/maint-rename-unmerged'
* 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