hgbook

diff fr/examples/mq.dodiff @ 992:8b0f1e2984d0

French translation : sync with original ch04-concepts
author Frédéric Bouquet <youshe.jaalon@gmail.com>
date Fri Sep 11 14:30:20 2009 +0200 (2009-09-11)
parents cac3ac4536e5
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/fr/examples/mq.dodiff	Fri Sep 11 14:30:20 2009 +0200
     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