From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 Sep 2012 18:10:12 +0000 (-0700)
Subject: Merge branch 'ph/stash-rerere' into maint-1.7.11
X-Git-Tag: v1.7.11.6~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ef92392b6c8596b61eab6f2045a54c086f340cf7

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