Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Dec 2010 00:36:03 +0000 (16:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Dec 2010 00:36:03 +0000 (16:36 -0800)
commit38a5932...e8a8f0b0bd3bb949bdc5258d9c753f15
tree9884763...2dea85d849b00b42b812f626bd7dbf29copy hash to clipboard (tree)
parentcf7a64b...4afe28ff61b362abc04399de383977e0copy hash to clipboard (diff)
parent4a689af...030c1cd5aa1c141db94bbf9dde42f05ecopy hash to clipboard (diff)
Documentation/git-difftool.txt