summaryrefslogtreecommitdiff
path: root/t/t4034/matlab
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-09-19 10:47:56 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-09-19 10:47:56 +0900
commit0543de438f39cc99bcde807313e972a6caac5840 (patch)
tree4237ec20e44a097a32834a3d17b4413b47eae6b4 /t/t4034/matlab
parentMerge branch 'jk/leak-checkers' (diff)
parentbuiltin/merge: honor commit-msg hook for merges (diff)
downloadtgif-0543de438f39cc99bcde807313e972a6caac5840.tar.xz
Merge branch 'sb/merge-commit-msg-hook'
As "git commit" to conclude a conflicted "git merge" honors the commit-msg hook, "git merge" that recoreds a merge commit that cleanly auto-merges should, but it didn't. * sb/merge-commit-msg-hook: builtin/merge: honor commit-msg hook for merges
Diffstat (limited to 't/t4034/matlab')
0 files changed, 0 insertions, 0 deletions