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

diff --combined git-stash.sh
index 4e2c7f83314954de6655b0d1bff773c31dfe3ed1,63d2f59fe528100554161a303f9dbf5a9d748600..bbefdf64244063f4708f381b8a772466d64e90e5
--- 1/git-stash.sh
--- 2/git-stash.sh
+++ b/git-stash.sh
@@@ -199,8 -199,8 +199,8 @@@ save_stash () 
                        #    $ git stash save --blah-blah 2>&1 | head -n 2
                        #    error: unknown option for 'stash save': --blah-blah
                        #           To provide a message, use git stash save -- '--blah-blah'
 -                      eval_gettextln "$("error: unknown option for 'stash save': \$option
 -       To provide a message, use git stash save -- '\$option'")"
 +                      eval_gettextln "error: unknown option for 'stash save': \$option
 +       To provide a message, use git stash save -- '\$option'"
                        usage
                        ;;
                *)
@@@ -469,6 -469,7 +469,7 @@@ apply_stash () 
        else
                # Merge conflict; keep the exit status from merge-recursive
                status=$?
+               git rerere
                if test -n "$INDEX_OPTION"
                then
                        gettextln "Index was not unstashed." >&2