summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-11-21 14:05:33 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-11-21 14:05:33 +0900
commit01e0c53c739854fda6d601a5a49ef1ccacd156fc (patch)
treecee34438b17d4ff74da5e67aee644c814257e2a0 /git-merge-resolve.sh
parentMerge branch 'tz/fsf-address-update' into maint (diff)
parentt4201: make use of abbreviation in the test more robust (diff)
downloadtgif-01e0c53c739854fda6d601a5a49ef1ccacd156fc.tar.xz
Merge branch 'cb/t4201-robustify' into maint
A test update. * cb/t4201-robustify: t4201: make use of abbreviation in the test more robust
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions