From: Junio C Hamano <redacted>
Date: Tue, 9 Jan 2018 18:41:37 +0000 (-0800)
Subject: Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty... 
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=5b1c54ac99e6847eaff409cd6fb328fd0f8d9076;p=git.git

Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty-index

* ew/empty-merge-with-dirty-index-maint:
  merge-recursive: do not look at the index during recursive merge
---

5b1c54ac99e6847eaff409cd6fb328fd0f8d9076