--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/prompt-session-git.sh Wed Sep 03 22:21:33 2014 +0900
+# paste this into an interactive shell
+cd /tmp/ && git init gitrepo && cd gitrepo/
+echo 's' >> foo && git commit -a -m 's'
+git merge master --strategy=ours --no-commit
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/prompt-session-hg.sh Wed Sep 03 22:21:33 2014 +0900
+# paste this into an interactive shell
+cd /tmp/ && hg init hgrepo && cd hgrepo/
+echo 'a' > foo && hg add foo
+echo 'b' >> foo && hg ci -m 'b'
+echo 's' >> foo && hg ci --secret -m 's'
+hg merge default -q --tool=internal:local
--- a/docs/prompt_screens.sh Fri Aug 29 02:51:26 2014 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-### MERCURIAL: PREPARE COMMIT GRAPH
-hg init /tmp/hgrepo && cd /tmp/hgrepo
-echo "Haikus are easy" > poem && hg ci --addremove -m "First steps"
-echo "Refrigerator" >> poem && hg ci -m "Progress!"
-# revision 2, another head
-hg up -r 0 && echo "But sometimes they don't make sense" >> poem && hg ci -m "How could I forget?"
-### MERCURIAL: DEMONSTRATE
-# clean repo at 2: minimal info
-hg branch branch && read
-# dirty working directory
-echo "Roses are red" >> poem && read
-# clean, but not up-to-date repo at 1