--- a/docs/prompt-session-git.sh	Sun Dec 21 17:55:50 2014 +0800
+++ b/docs/prompt-session-git.sh	Sun Dec 21 18:00:24 2014 +0800
@@ -11,4 +11,6 @@
 git checkout -q HEAD@{1}
 git checkout -q -b secret
 echo 's' >> foo && git commit -q -a -m 's'
+git merge master
+git reset --merge
 git merge master --strategy=ours --no-commit