hgbook
diff ja/examples/mq.dodiff.diff.out @ 963:1dd00abb3fa9
merge with bryan - it's been a while but everything seems ok
author | Romain PELISSE <belaran@gmail.com> |
---|---|
date | Sun Aug 16 03:41:39 2009 +0200 (2009-08-16) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/ja/examples/mq.dodiff.diff.out Sun Aug 16 03:41:39 2009 +0200 1.3 @@ -0,0 +1,13 @@ 1.4 +$ \textbf{echo 'this is my first line' > oldfile} 1.5 +$ \textbf{echo 'my first line is here' > newfile} 1.6 +$ \textbf{diff -u oldfile newfile > tiny.patch} 1.7 +$ \textbf{cat tiny.patch} 1.8 + 1.9 + 1.10 +@@ -1 +1 @@ 1.11 +-this is my first line 1.12 ++my first line is here 1.13 +$ \textbf{patch < tiny.patch} 1.14 +patching file oldfile 1.15 +$ \textbf{cat oldfile} 1.16 +my first line is here