diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-10-07 22:40:51 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-10-07 22:40:51 +0200 |
commit | 3c2dc76f015b4d52ef02a08c59a4546d00b475e1 (patch) | |
tree | 5ad1220b92c71894cfb1aed3971bb84f1d72d63f /mergetools | |
parent | Merge branch 'jk/mbox-from-line' into maint (diff) | |
parent | Merge branch 'maint-1.9' into maint-2.0 (diff) | |
download | git-3c2dc76f015b4d52ef02a08c59a4546d00b475e1.tar.xz git-3c2dc76f015b4d52ef02a08c59a4546d00b475e1.zip |
Merge branch 'maint-2.0' into maint
* maint-2.0:
git-tag.txt: Add a missing hyphen to `-s`
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions