hgbook

diff es/examples/extdiff @ 357:dae36f024e14

some paragraphs translated, added a couple of rules-of-thumb for translation of terms
author Javier Rojas <jerojasro@devnull.li>
date Thu Oct 23 03:13:35 2008 -0500 (2008-10-23)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/es/examples/extdiff	Thu Oct 23 03:13:35 2008 -0500
     1.3 @@ -0,0 +1,28 @@
     1.4 +#!/bin/bash
     1.5 +
     1.6 +echo '[extensions]' >> $HGRC
     1.7 +echo 'extdiff =' >> $HGRC
     1.8 +
     1.9 +hg init a
    1.10 +cd a
    1.11 +echo 'The first line.' > myfile
    1.12 +hg ci -Ama
    1.13 +echo 'The second line.' >> myfile
    1.14 +
    1.15 +#$ name: diff
    1.16 +
    1.17 +hg diff
    1.18 +
    1.19 +#$ name: extdiff
    1.20 +
    1.21 +hg extdiff
    1.22 +
    1.23 +#$ name: extdiff-ctx
    1.24 +
    1.25 +#$ ignore: ^\*\*\* a.*
    1.26 +
    1.27 +hg extdiff -o -NprcC5
    1.28 +
    1.29 +#$ name:
    1.30 +
    1.31 +exit 0