summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-01 01:43:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-02-01 01:43:28 (GMT)
commit2edefe38a813deb4dfbd62dcf47520aeb1af15fc (patch)
treeeb3b241d33eb2abda586b947825a7d1cf5f1ca6a /.gitignore
parentddebfd1f27110bbcd0e8da0417bc425509af219a (diff)
parentfb700cb0679e22900f0d1435641e6cf7c652968b (diff)
downloadgit-2edefe38a813deb4dfbd62dcf47520aeb1af15fc.zip
git-2edefe38a813deb4dfbd62dcf47520aeb1af15fc.tar.gz
git-2edefe38a813deb4dfbd62dcf47520aeb1af15fc.tar.bz2
Merge branch 'jg/mergetool'
* jg/mergetool: mergetool: Don't repeat merge tool candidates
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions