hgbook
annotate es/examples/mq.dodiff @ 336:7e52f0cc4516
changed es/hgext.tex
changed es/hook.tex
changed es/kdiff3.png
changed es/license.tex
changed es/mq-collab.tex
changed es/mq-ref.tex
changed es/mq.tex
changed es/note.png
changed es/tour-merge.tex
changed es/undo-manual-merge.dot
changed es/undo-non-tip.dot
files needed to compile the pdf version of the book.
changed es/hook.tex
changed es/kdiff3.png
changed es/license.tex
changed es/mq-collab.tex
changed es/mq-ref.tex
changed es/mq.tex
changed es/note.png
changed es/tour-merge.tex
changed es/undo-manual-merge.dot
changed es/undo-non-tip.dot
files needed to compile the pdf version of the book.
| author | jerojasro@localhost |
|---|---|
| date | Sat Oct 18 15:44:41 2008 -0500 (2008-10-18) |
| parents | |
| children |
| rev | line source |
|---|---|
| igor@333 | 1 #!/bin/bash |
| igor@333 | 2 |
| igor@333 | 3 #$ name: diff |
| igor@333 | 4 |
| igor@333 | 5 echo 'this is my original thought' > oldfile |
| igor@333 | 6 echo 'i have changed my mind' > newfile |
| igor@333 | 7 |
| igor@333 | 8 diff -u oldfile newfile > tiny.patch |
| igor@333 | 9 |
| igor@333 | 10 cat tiny.patch |
| igor@333 | 11 |
| igor@333 | 12 patch < tiny.patch |
| igor@333 | 13 |
| igor@333 | 14 cat oldfile |