hgbook

diff es/examples/mq.dodiff @ 960:e3913a4b5b26

Fixing leftovers stuff from last merge with Wilkk
author Romain PELISSE <belaran@gmail.com>
date Tue Feb 24 00:03:10 2009 +0100 (2009-02-24)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/es/examples/mq.dodiff	Tue Feb 24 00:03:10 2009 +0100
     1.3 @@ -0,0 +1,14 @@
     1.4 +#!/bin/bash
     1.5 +
     1.6 +#$ name: diff
     1.7 +
     1.8 +echo 'this is my original thought' > oldfile
     1.9 +echo 'i have changed my mind' > newfile
    1.10 +
    1.11 +diff -u oldfile newfile > tiny.patch
    1.12 +
    1.13 +cat tiny.patch
    1.14 +
    1.15 +patch < tiny.patch
    1.16 +
    1.17 +cat oldfile