diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-12-21 10:50:20 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-12-21 10:50:20 -0800 |
commit | f1f509cc4504ebe9e2922c7bc61794183e3d441a (patch) | |
tree | 747009988da437c4e9e20052f808a48be8934beb /builtin/merge-file.c | |
parent | 97f261b1e7f1af54aed700e61cdb8af74dbd2459 (diff) | |
parent | ee0400df4eb13ea9b1ee3f03a50e479048f1780f (diff) | |
download | git-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