Mercurial > hgbook
view en/examples/mq.dodiff.diff.out @ 156:91a936be78b8
Document merge behaviour with file names.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 12 Mar 2007 23:11:26 -0700 |
parents | 006bbad1f190 |
children | bdd271cf1ae1 |
line wrap: on
line source
$ \textbf{echo 'this is my first line' > oldfile} $ \textbf{echo 'my first line is here' > newfile} $ \textbf{diff -u oldfile newfile > tiny.patch} $ \textbf{cat tiny.patch} @@ -1 +1 @@ -this is my first line +my first line is here $ \textbf{patch < tiny.patch} patching file oldfile $ \textbf{cat newfile} my first line is here