Merge branch 'rs/unpack-trees-tree-walk-conflict-field'
Code clean-up. * rs/unpack-trees-tree-walk-conflict-field: unpack-trees: don't shift conflicts left and right
Junio C Hamano committed
Jun 24, 2013 at 13:48 UTC
bd21822572d2852917abd71d030c8b2e789eb4de
No changes.