Merge branch 'tr/userdiff-c-returns-pointer' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Dec 2011 19:42:45 +0000 (11:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Dec 2011 19:42:45 +0000 (11:42 -0800)
commitf0b4fd4...074d8cf3f9db9c444c8e1e125e0cc517
tree075ca67...5fc65ac88b949dde126a4ec3d0056ef1copy hash to clipboard (tree)
parent406cc9b...22b44a1d53c1a45536460992529aec88copy hash to clipboard (diff)
parent37e7793...473019eac69c347f1a79e3273567b9bfcopy hash to clipboard (diff)
userdiff.c