hgbook

view en/examples/mq.dodiff @ 707:f3a4e6040421

Fix chapter 4 HGMERGE line
author Dale Glass <dale@daleglass.net>
date Thu Aug 13 13:22:09 2009 -0700 (2009-08-13)
parents f2061ece8ed9
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