summaryrefslogtreecommitdiff
path: root/t/t6037-merge-ours-theirs.sh
diff options
context:
space:
mode:
authorLibravatar Pete Wyckoff <pw@padd.com>2012-01-11 18:31:07 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-01-11 16:35:38 -0800
commit329afb8e976b2605bbc92a6ac8ef63f9a6c98ef1 (patch)
tree29ad93f63973670653f5bca9651aa3f6efb4581c /t/t6037-merge-ours-theirs.sh
parentgit-p4: only a single ... wildcard is supported (diff)
downloadtgif-329afb8e976b2605bbc92a6ac8ef63f9a6c98ef1.tar.xz
git-p4: fix verbose comment typo
Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions