From: Junio C Hamano <redacted>
Date: Tue, 11 Sep 2012 18:10:12 +0000 (-0700)
Subject: Merge branch 'ph/stash-rerere' into maint-1.7.11
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=ef92392b6c8596b61eab6f2045a54c086f340cf7;p=git.git

Merge branch 'ph/stash-rerere' into maint-1.7.11

* ph/stash-rerere:
  stash: invoke rerere in case of conflict
  test: git-stash conflict sets up rerere
---

ef92392b6c8596b61eab6f2045a54c086f340cf7