summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-06-20 21:49:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-06-20 21:49:44 (GMT)
commit13b70d2ad96a79fb439c6b4fc0e8058b1762bae2 (patch)
treea3f7708ea1875ace01b23cb4047ccb3cfd43cd18 /t/t7610-mergetool.sh
parentdc4cd767108532161d27554162a8742f5b607eb8 (diff)
parent93d5e0c2087916941934b1e55c979c52f5af3f20 (diff)
downloadgit-13b70d2ad96a79fb439c6b4fc0e8058b1762bae2.zip
git-13b70d2ad96a79fb439c6b4fc0e8058b1762bae2.tar.gz
git-13b70d2ad96a79fb439c6b4fc0e8058b1762bae2.tar.bz2
Merge branch 'mk/grep-pcre'
* mk/grep-pcre: t7810: avoid unportable use of "echo"
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions