hgbook

view 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
line source
1 #!/bin/bash
3 #$ name: diff
5 echo 'this is my original thought' > oldfile
6 echo 'i have changed my mind' > newfile
8 diff -u oldfile newfile > tiny.patch
10 cat tiny.patch
12 patch < tiny.patch
14 cat oldfile