summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2013-10-14 11:09:30 -0700
committerLibravatar Jonathan Nieder <jrnieder@gmail.com>2013-10-14 11:09:30 -0700
commit774282d16ab5aa2ec4b8bb7fa4ad83b0622ee778 (patch)
tree9f30c5c347f486237eea76851f373db673c35cc3 /git-mergetool.sh
parentMerge branch 'rt/cherry-pick-status' (diff)
parentcheckout test: enable test with complex relative path (diff)
downloadtgif-774282d16ab5aa2ec4b8bb7fa4ad83b0622ee778.tar.xz
Merge branch 'sb/checkout-test-complex-path'
* sb/checkout-test-complex-path: checkout test: enable test with complex relative path
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions