diff en/examples/tour-merge-conflict @ 708:d6ca1334a19d
Japanese translation on a24b370a16ee
author |
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
date |
Fri Jul 31 19:49:16 2009 +0900 (2009-07-31) |
parents |
5b80c922ebdd |
children |
e281bd9a8e47 |
line diff
1.1 --- a/en/examples/tour-merge-conflict Thu Oct 19 15:18:07 2006 -0700
1.2 +++ b/en/examples/tour-merge-conflict Fri Jul 31 19:49:16 2009 +0900
1.3 @@ -53,6 +53,7 @@
1.4 hg pull -u ../scam-son
1.5
1.6 #$ name: merge
1.7 +#$ ignore: [<>]{7} /tmp/.*
1.8
1.9 export HGMERGE=merge
1.10 hg merge