Mercurial > hgbook

diff en/examples/tour-merge-conflict.wife.out @ 144:006bbad1f190

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add expected output files. This makes it possible to spot changes in Mercurial's output and behaviour over time.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 06 Mar 2007 21:44:56 -0800
parents
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/tour-merge-conflict.wife.out	Tue Mar 06 21:44:56 2007 -0800
@@ -0,0 +1,7 @@
+$ \textbf{cat > letter.txt <<EOF}
+> \textbf{Greetings!}
+> \textbf{I am Mariam Abacha, the wife of former}
+> \textbf{Nigerian dictator Sani Abacha.}
+> \textbf{EOF}
+$ \textbf{hg add letter.txt}
+$ \textbf{hg commit -m '419 scam, first draft'}