summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorLibravatar Pete Wyckoff <pw@padd.com>2014-01-21 18:16:41 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-01-22 08:05:26 -0800
commit630c4f19f0d4f4c6a485af944d88665979fa0e1f (patch)
treec9cd5c1cda7171803f4beba757cd676750e57f0d /Documentation/git-mergetool--lib.txt
parentgit p4: work around p4 bug that causes empty symlinks (diff)
downloadtgif-630c4f19f0d4f4c6a485af944d88665979fa0e1f.tar.xz
git p4 test: explicitly check p4 wildcard delete
There was no test where p4 deleted a file with a wildcard character. Make sure git p4 applies the wildcard decoding properly when importing a delete that includes a wildcard. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions