Merge branch 'jk/xdiff-interface'
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Nov 2018 13:37:27 +0000 (22:37 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Nov 2018 13:37:27 +0000 (22:37 +0900)
commit39d23df...409e51844ddda99599927092c8300f12
treef4975a6...a1fb9c33a875fe72042e9b7c75519597copy hash to clipboard (tree)
parentf22838a...7a6dcf308a3307ba17f8afa40989ad3acopy hash to clipboard (diff)
parent5eade07...6e1daf659a9559d804068f9f31614625copy hash to clipboard (diff)
builtin/merge-tree.c
builtin/rerere.c
combine-diff.c
diff.c
diffcore-pickaxe.c
range-diff.c
xdiff-interface.c