Anton Shestakov <engored@ya.ru>, Sun, 21 Dec 2014 18:00:24 +0800
git prompt session: demonstrate merge with conflicts
docs/prompt-session-hg.sh
Permissions: -rw-r--r--
# paste this into an interactive shell 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 ci --close-branch -m
'done here'hg up default -q
&& hg merge secret -q --tool
=internal:local
hg tag
0.1
&& hg up -q
0.1
hg up -q
&& hg bookmark @