hgbook
annotate es/examples/mq.dodiff @ 380:1a4b507935de
began translation of tour-merge
author | Javier Rojas <jerojasro@devnull.li> |
---|---|
date | Wed Oct 29 00:37:55 2008 -0500 (2008-10-29) |
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 |