Mercurial > hgbook

view es/examples/mq.dodiff @ 836:d819bc2414f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add figs/bad-merge-*.dot. a part of 7226e5e750a6.
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Thu, 23 Jul 2009 18:10:58 +0900
parents 04c08ad7e92e
children
line wrap: on
line source

#!/bin/bash

#$ name: diff

echo 'this is my original thought' > oldfile
echo 'i have changed my mind' > newfile

diff -u oldfile newfile > tiny.patch

cat tiny.patch

patch < tiny.patch

cat oldfile