From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 24 Jun 2013 20:48:44 +0000 (-0700)
Subject: Merge branch 'rs/unpack-trees-tree-walk-conflict-field'
X-Git-Tag: v1.8.4-rc0~137
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd21822572d2852917abd71d030c8b2e789eb4de;p=thirdparty%2Fgit.git

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
---

bd21822572d2852917abd71d030c8b2e789eb4de