hgbook

diff en/examples/mq.dodiff @ 199:58e3a6c76725

More branch/merge stuff.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Apr 16 17:37:27 2007 -0700 (2007-04-16)
parents 5cee64874312
children f2061ece8ed9
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/examples/mq.dodiff	Mon Apr 16 17:37:27 2007 -0700
     1.3 @@ -0,0 +1,14 @@
     1.4 +#!/bin/bash
     1.5 +
     1.6 +#$ name: diff
     1.7 +
     1.8 +echo 'this is my first line' > oldfile
     1.9 +echo 'my first line is here' > 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 newfile