summaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-07-10 14:17:56 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-07-10 14:17:56 -0700
commit3cbb92054b2b9cafbf2a662f7858e5896d3e7ac4 (patch)
tree492e445de21e3ddc79e51c110e7391f91333d158 /builtin/fmt-merge-msg.c
parentMerge branch 'rh/test-color-avoid-terminfo-in-original-home' (diff)
parentcontrib/subtree: small tidy-up to test (diff)
downloadtgif-3cbb92054b2b9cafbf2a662f7858e5896d3e7ac4.tar.xz
Merge branch 'cb/subtree-tests-update'
Tests update in contrib/subtree. * cb/subtree-tests-update: contrib/subtree: small tidy-up to test contrib/subtree: fix broken &&-chains and revealed test error contrib/subtree: use tabs consitently for indentation in tests
Diffstat (limited to 'builtin/fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions