test: git-stash conflict sets up rerere