summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-07 20:40:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-07 20:40:51 (GMT)
commit3c2dc76f015b4d52ef02a08c59a4546d00b475e1 (patch)
tree5ad1220b92c71894cfb1aed3971bb84f1d72d63f /git-mergetool--lib.sh
parentb6e8269e9ba131b6ea6a10088be139dc89704fb6 (diff)
parent76f8611a5fb7e81c1bada0fb190d573a66fc03f6 (diff)
downloadgit-3c2dc76f015b4d52ef02a08c59a4546d00b475e1.zip
git-3c2dc76f015b4d52ef02a08c59a4546d00b475e1.tar.gz
git-3c2dc76f015b4d52ef02a08c59a4546d00b475e1.tar.bz2
Merge branch 'maint-2.0' into maint
* maint-2.0: git-tag.txt: Add a missing hyphen to `-s`
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions