unpack-trees: don't shift conflicts left and right
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>
Sat, 15 Jun 2013 23:44:43 +0000 (01:44 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Jun 2013 16:24:47 +0000 (09:24 -0700)
commit603d249...53981d81d1f8cf561b18d77cb1b55923
treeada9255...6b9eeef99de56ed4ce1ec02696214730copy hash to clipboard (tree)
parentedca415...560522a431a51fc0a06147fc680b5b18copy hash to clipboard (diff)
tree-walk.h
unpack-trees.c