Mercurial > hgbook

diff en/examples/tour-merge-conflict @ 139:ceaca14e49f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add local regexps to ignore bits of output.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 06 Mar 2007 20:46:07 -0800
parents 5b80c922ebdd
children e281bd9a8e47
line wrap: on
line diff
--- a/en/examples/tour-merge-conflict	Tue Mar 06 20:45:50 2007 -0800
+++ b/en/examples/tour-merge-conflict	Tue Mar 06 20:46:07 2007 -0800
@@ -53,6 +53,7 @@
 hg pull -u ../scam-son
 
 #$ name: merge
+#$ ignore: [<>]{7} /tmp/.*
 
 export HGMERGE=merge
 hg merge