diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-07-01 16:22:42 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-07-01 16:22:42 -0700 |
commit | 5e707b28d9ea0bebfef5aff977e3ccebd53aa045 (patch) | |
tree | 866254290cfe6006a269386770b26936d718a5ae /Documentation/git-commit.txt | |
parent | 27158e463a1be339ce34c7ee5fb553acaa7e28de (diff) | |
parent | 641dba49bf819dc5f4874a75b206bc7f51dc14e6 (diff) | |
download | git-5e707b28d9ea0bebfef5aff977e3ccebd53aa045.tar.gz git-5e707b28d9ea0bebfef5aff977e3ccebd53aa045.tar.xz |
Merge branch 'ph/mergetool'
* ph/mergetool:
Remove the use of '--' in merge program invocation
Diffstat (limited to 'Documentation/git-commit.txt')
0 files changed, 0 insertions, 0 deletions