summaryrefslogtreecommitdiff
path: root/Documentation/howto/maintain-git.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-01-31 17:43:28 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-31 17:43:28 -0800
commit2edefe38a813deb4dfbd62dcf47520aeb1af15fc (patch)
treeeb3b241d33eb2abda586b947825a7d1cf5f1ca6a /Documentation/howto/maintain-git.txt
parentMerge branch 'maint' (diff)
parentmergetool: Don't repeat merge tool candidates (diff)
downloadtgif-2edefe38a813deb4dfbd62dcf47520aeb1af15fc.tar.xz
Merge branch 'jg/mergetool'
* jg/mergetool: mergetool: Don't repeat merge tool candidates
Diffstat (limited to 'Documentation/howto/maintain-git.txt')
0 files changed, 0 insertions, 0 deletions