summaryrefslogtreecommitdiff
path: root/mergetools/meld
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-10-07 13:40:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-10-07 13:40:51 -0700
commit3c2dc76f015b4d52ef02a08c59a4546d00b475e1 (patch)
tree5ad1220b92c71894cfb1aed3971bb84f1d72d63f /mergetools/meld
parentMerge branch 'jk/mbox-from-line' into maint (diff)
parentMerge branch 'maint-1.9' into maint-2.0 (diff)
downloadtgif-3c2dc76f015b4d52ef02a08c59a4546d00b475e1.tar.xz
Merge branch 'maint-2.0' into maint
* maint-2.0: git-tag.txt: Add a missing hyphen to `-s`
Diffstat (limited to 'mergetools/meld')
0 files changed, 0 insertions, 0 deletions