Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context'
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Sep 2016 22:15:26 +0000 (15:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Sep 2016 22:15:26 +0000 (15:15 -0700)
commit4ed3863...ec6fa08b4bef42a35d87f95c0582b97b
treeebabad8...8f3f9af6cf34cbb45faa4dfc402bddcdcopy hash to clipboard (tree)
parente9c6d3d...c2112f0d6190681211ea76b714fcd704copy hash to clipboard (diff)
parent45d2f75...913c0545be473db1dc2595a1600413f5copy hash to clipboard (diff)
xdiff/xemit.c