Merge branch 'ph/stash-rerere' into maint-1.7.11
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:10:12 +0000 (11:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:10:12 +0000 (11:10 -0700)
commitef92392b6c8596b61eab6f2045a54c086f340cf7
tree961a30992de888f4fd135507cb33ebf1f6bfcf56
parent91feb387f2cba906a233c3683cfa5ff2bc32d79a
parent743bf6d8b07f0c5717bf5c37b8b50ae9de619c83
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
git-stash.sh