hgbook
view en/examples/mq.dodiff.diff.out @ 302:e281bd9a8e47
Fix sample output for test 'tour-merge-conflict'.
Fix test itself as well (now requires 'hg resolve').
Fix test itself as well (now requires 'hg resolve').
| author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
|---|---|
| date | Wed Aug 20 22:00:46 2008 +0200 (2008-08-20) |
| parents | bdd271cf1ae1 |
| children |
line source
1 $ \textbf{echo 'this is my original thought' > oldfile}
2 $ \textbf{echo 'i have changed my mind' > newfile}
3 $ \textbf{diff -u oldfile newfile > tiny.patch}
4 $ \textbf{cat tiny.patch}
7 @@ -1 +1 @@
8 -this is my original thought
9 +i have changed my mind
10 $ \textbf{patch < tiny.patch}
11 patching file oldfile
12 $ \textbf{cat oldfile}
13 i have changed my mind