summaryrefslogtreecommitdiff
path: root/mergetools/opendiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-08-23 14:33:46 -0700
committerJunio C Hamano <gitster@pobox.com>2017-08-23 14:33:46 -0700
commitd3b7ee087e3ed409b943d62501bd7fb8dbd96dd8 (patch)
tree1ed0f2f407610d50b984a4fa9b95bb72eaa17c14 /mergetools/opendiff
parent752732c6d802ebc01a26e59614da38f900e3b89e (diff)
parent168e63554cbd965fee4d0092e02f8170eba7481f (diff)
downloadgit-d3b7ee087e3ed409b943d62501bd7fb8dbd96dd8.tar.gz
Merge branch 'rs/move-array' into maint
Code clean-up. * rs/move-array: ls-files: don't try to prune an empty index apply: use COPY_ARRAY and MOVE_ARRAY in update_image() use MOVE_ARRAY add MOVE_ARRAY
Diffstat (limited to 'mergetools/opendiff')
0 files changed, 0 insertions, 0 deletions