annotate en/examples/tour.merge.clone.out @ 305:ef34f7bec749
Fix sample output for 'extdiff' test.
| author |
Guido Ostkamp <hg@ostkamp.fastmail.fm> |
| date |
Wed Aug 20 22:04:41 2008 +0200 (2008-08-20) |
| parents |
|
| children |
1b52bda675d0 |
| rev |
line source |
|
bos@144
|
1 $ \textbf{cd ..}
|
|
bos@144
|
2 $ \textbf{hg clone hello my-new-hello}
|
|
bos@144
|
3 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
bos@144
|
4 $ \textbf{cd my-new-hello}
|
|
bos@144
|
5 $ \textbf{sed -i '/printf/i\textbackslash{}\textbackslash{}tprintf("once more, hello.\textbackslash{}\textbackslash{}n");' hello.c}
|
|
bos@144
|
6 $ \textbf{hg commit -m 'A new hello for a new day.'}
|
