From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Sep 2012 22:54:12 +0000 (-0700)
Subject: Merge branch 'ph/stash-rerere'
X-Git-Tag: v1.8.0-rc0~110
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=799beac15391004778186503bf198783960a82a3;p=git.git

Merge branch 'ph/stash-rerere'

"git stash" internally used "git merge-recursive" backend, which did
not trigger "rerere" upon conflicts unlike other mergy operations.

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

799beac15391004778186503bf198783960a82a3