summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-28 16:01:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-10-28 16:01:24 (GMT)
commit020222ef4dc1c8478fd217ccc524677215674821 (patch)
tree44caea5ec71e43b5e2a89037aab0ddcf241a04e7 /git-mergetool--lib.sh
parent334c2a19593fa0dfb7c0636bfcd43c31bb7b4ad1 (diff)
parent86009f32bb0e17829f0178953729e78f69e831c6 (diff)
downloadgit-020222ef4dc1c8478fd217ccc524677215674821.zip
git-020222ef4dc1c8478fd217ccc524677215674821.tar.gz
git-020222ef4dc1c8478fd217ccc524677215674821.tar.bz2
Merge branch 'pb/test-parse-options-expect' into maint
Test clean-up. * pb/test-parse-options-expect: t0040: convert all possible tests to use `test-parse-options --expect`
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions