My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
Code clean-up.

* rs/unpack-trees-tree-walk-conflict-field:
  unpack-trees: don't shift conflicts left and right

1  2 
unpack-trees.c patch | diff1 | diff2 | blob | history

diff --cc unpack-trees.c
Simple merge
The core git plumbing