hgbook

view en/examples/mq.dodiff @ 100:272146fab009

find changesets by author, revision, files, or words in the commit message
Add yet another illustration of the merge process.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed Oct 18 12:06:56 2006 -0700 (2006-10-18)
parents 5cee64874312
children f2061ece8ed9
line source
1 #!/bin/bash
2
3 #$ name: diff
4
5 echo 'this is my first line' > oldfile
6 echo 'my first line is here' > newfile
7
8 diff -u oldfile newfile > tiny.patch
9
10 cat tiny.patch
11
12 patch < tiny.patch
13
14 cat newfile