| commit | bd21822572d2852917abd71d030c8b2e789eb4de | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 24 Jun 2013 20:48:44 +0000 (24 13:48 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 24 Jun 2013 20:48:44 +0000 (24 13:48 -0700) | ||
| tree | 89e267bd418726f4a316b8899cb20e4ec0a59816 | treesnapshot (tar.gz zip) |
| parent | bc918acf708a839bbc350e014d599fdd458319ca | commitdiff |
| parent | 603d249853981d81d1f8cf561b18d77cb1b55923 | commitdiff |
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
Code clean-up.
* rs/unpack-trees-tree-walk-conflict-field:
unpack-trees: don't shift conflicts left and right
| unpack-trees.c | diff1 | diff2 | blobhistory |