hgbook

diff es/examples/mq.dodiff @ 336:7e52f0cc4516

find changesets by author, revision, files, or words in the commit message
changed es/hgext.tex
changed es/hook.tex
changed es/kdiff3.png
changed es/license.tex
changed es/mq-collab.tex
changed es/mq-ref.tex
changed es/mq.tex
changed es/note.png
changed es/tour-merge.tex
changed es/undo-manual-merge.dot
changed es/undo-non-tip.dot

files needed to compile the pdf version of the book.
author jerojasro@localhost
date Sat Oct 18 15:44:41 2008 -0500 (2008-10-18)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/es/examples/mq.dodiff	Sat Oct 18 15:44:41 2008 -0500
     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