Junio C Hamano ae371116d9 Merge branch 'ph/stash-rerere' into next ...

"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

2012-08-20 12:44:46 -07:00

13 KiB

Executable File

Raw Blame History

View Raw