summaryrefslogtreecommitdiff
path: root/t/t3310-notes-merge-manual-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-02-22 12:28:23 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-02-22 12:28:23 -0800
commitdf3f4ba1a3f03ea755253a1a79ca8080768ba935 (patch)
tree77e86c97894fa34aa4176bc1007e4cdce57a66ef /t/t3310-notes-merge-manual-resolve.sh
parentPost 2.3 cycle (batch #3) (diff)
parentcheck-builtins: strip executable suffix $X when enumerating builtins (diff)
downloadtgif-df3f4ba1a3f03ea755253a1a79ca8080768ba935.tar.xz
Merge branch 'ss/check-builtins-on-windows'
* ss/check-builtins-on-windows: check-builtins: strip executable suffix $X when enumerating builtins
Diffstat (limited to 't/t3310-notes-merge-manual-resolve.sh')
0 files changed, 0 insertions, 0 deletions