summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-21 10:50:20 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-21 10:50:20 -0800
commitf1f509cc4504ebe9e2922c7bc61794183e3d441a (patch)
tree747009988da437c4e9e20052f808a48be8934beb /builtin/merge-file.c
parent97f261b1e7f1af54aed700e61cdb8af74dbd2459 (diff)
parentee0400df4eb13ea9b1ee3f03a50e479048f1780f (diff)
downloadgit-f1f509cc4504ebe9e2922c7bc61794183e3d441a.tar.gz
Merge branch 'ms/commit-cc-option-helpstring' into maint
* ms/commit-cc-option-helpstring: builtin/commit: add missing '/' in help message
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions