hgbook
annotate en/examples/mq.dodiff.diff.out @ 198:615f3c6b30e1
Start to describe branch management.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Mon Apr 16 17:21:38 2007 -0700 (2007-04-16) |
| parents | |
| children | bdd271cf1ae1 |
| rev | line source |
|---|---|
| bos@144 | 1 $ \textbf{echo 'this is my first line' > oldfile} |
| bos@144 | 2 $ \textbf{echo 'my first line is here' > newfile} |
| bos@144 | 3 $ \textbf{diff -u oldfile newfile > tiny.patch} |
| bos@144 | 4 $ \textbf{cat tiny.patch} |
| bos@144 | 5 |
| bos@144 | 6 |
| bos@144 | 7 @@ -1 +1 @@ |
| bos@144 | 8 -this is my first line |
| bos@144 | 9 +my first line is here |
| bos@144 | 10 $ \textbf{patch < tiny.patch} |
| bos@144 | 11 patching file oldfile |
| bos@144 | 12 $ \textbf{cat newfile} |
| bos@144 | 13 my first line is here |