From: Phil Hord <hordp@cisco.com>
Date: Sat, 07 Jul 2012 20:46:00 GMT
Subject: [PATCH v2 0/2] stash: invoke rerere in case of conflict
Message-ID: <1341693962-17090-1-git-send-email-hordp@cisco.com>
In-Reply-To: <CABURp0oXhZ5ysm4b3Z=7o+2TB+3wFdMjj4oEwxafApjD4c7ozA@mail.gmail.com>

[PATCH v2 1/2] test: git-stash conflict sets up rerere
A rewritten failing test to verify rerere is used during 
'stash apply' conflicts.

[PATCH v2 2/2] stash: invoke rerere in case of conflict
The fix (written entirely by JCH) and switched the test
to expect success.