summaryrefslogtreecommitdiffstats
path: root/mergetools/meld
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-11-25 01:04:41 +0100
committerJeff King <peff@peff.net>2015-11-25 01:04:41 +0100
commit718a9e67b69d80bee82952dcba5e39198d7d097d (patch)
treebc655ee78e54fa5c4359e7f4e98a54231e3ba076 /mergetools/meld
parentMerge branch 'master' of git://git.bogomips.org/git-svn (diff)
parentDocumentation/git-update-index: add missing opts to synopsys (diff)
downloadgit-718a9e67b69d80bee82952dcba5e39198d7d097d.tar.xz
git-718a9e67b69d80bee82952dcba5e39198d7d097d.zip
Merge branch 'maint'
* maint: Documentation/git-update-index: add missing opts to synopsys
Diffstat (limited to 'mergetools/meld')
0 files changed, 0 insertions, 0 deletions