Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 29 Sep 2016 23:49:39 +0000 (16:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 Sep 2016 23:49:39 +0000 (16:49 -0700)
commitef4f0ca...4ba2340d02e79f60a5b5a308048222c7
tree17ff9af...98e5d38d17e9cc7d06e46ad0413f1f9acopy hash to clipboard (tree)
parente007a09...d49d58105a93a22bd4e6d33f6b3eacbdcopy hash to clipboard (diff)
parent45d2f75...913c0545be473db1dc2595a1600413f5copy hash to clipboard (diff)
xdiff/xemit.c