Merge branch 'mm/maint-hint-failed-merge' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 21:52:54 +0000 (13:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 21:52:54 +0000 (13:52 -0800)
commit24807f9...5bada2475fddd153365c1debfe1309bc
tree5a16341...d3e937e0af47f57a6acbebe0df18f9cbcopy hash to clipboard (tree)
parentd718c19...c686a15ed69cd7631e50613dd4901e03copy hash to clipboard (diff)
parente63ec00...b2a0c89f0c1cbc4862dcef7c4a14a785copy hash to clipboard (diff)
Documentation/config.txt