Merge branch 'rs/xdiff-lose-emit-func'
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 May 2012 22:22:13 +0000 (15:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 May 2012 22:22:13 +0000 (15:22 -0700)
commit2e464dd...b220d4d2d8a16d5c43efe7af3c9adda9
treee36a8a2...733792bdcad789363fb0f50985123d11copy hash to clipboard (tree)
parent8be441e...1fbd6e39952c5c314014162900c2c148copy hash to clipboard (diff)
parent85c20c3...4f991b33b59fbf00182a66f5cf6d2960copy hash to clipboard (diff)