Merge branch 'tr/maint-word-diff-regex-sticky' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 Apr 2012 17:34:43 +0000 (10:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Apr 2012 17:34:44 +0000 (10:34 -0700)
commit7b90ed5...fab1b288b4a9ac888d1c5a194a66c812
treef64d4a8...e69cc3c65ee0dc2c57ad532a4c25a05ecopy hash to clipboard (tree)
parent0584326...5bba2e0b282725865437fbd57ddfa02ecopy hash to clipboard (diff)
parent6440d34...7c1d51a20014d4b6fc6c59bacfa87dabcopy hash to clipboard (diff)
diff.c