Merge branch 'jk/userdiff-config-simplify'
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Feb 2012 20:57:17 +0000 (12:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Feb 2012 20:57:17 +0000 (12:57 -0800)
commit63d37c3...62e13cb2828edf63bc03cce1b6c41fd0
tree058aa2f...3f357e626c3458a89443ea07fa0f5345copy hash to clipboard (tree)
parent5f90b6f...0f5cf1d06bc72ffe607be3cd6aa955b5copy hash to clipboard (diff)
parent6680a08...4f86600cc8b4b5327384934d83d752a8copy hash to clipboard (diff)
diff.c