projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bc918ac 603d249)
Merge branch 'rs/unpack-trees-tree-walk-conflict-field'
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Jun 2013 20:48:44 +0000 (13:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Jun 2013 20:48:44 +0000 (13:48 -0700)
commitbd21822572d2852917abd71d030c8b2e789eb4de
tree89e267bd418726f4a316b8899cb20e4ec0a59816tree | snapshot
parentbc918acf708a839bbc350e014d599fdd458319cacommit | diff
parent603d249853981d81d1f8cf561b18d77cb1b55923commit | diff
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
unpack-trees.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.