summaryrefslogtreecommitdiff
path: root/xdiff/xdiff.h
diff options
context:
space:
mode:
authorAvery Pennarun <apenwarr@gmail.com>2009-11-26 02:23:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-18 06:46:28 (GMT)
commite3cba962b172804ca1cab82801d94858154bd8cc (patch)
treeaba1ebfaaaf451032fd5d62e875afbc0db6b7bdd /xdiff/xdiff.h
parent85e51b783c3a92b42275442147e7a27e17d42276 (diff)
downloadgit-e3cba962b172804ca1cab82801d94858154bd8cc.zip
git-e3cba962b172804ca1cab82801d94858154bd8cc.tar.gz
git-e3cba962b172804ca1cab82801d94858154bd8cc.tar.bz2
Extend merge-subtree tests to test -Xsubtree=dir.
This tests the configurable -Xsubtree feature of merge-recursive. Signed-off-by: Avery Pennarun <apenwarr@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xdiff.h')
0 files changed, 0 insertions, 0 deletions