equal
deleted
inserted
replaced
9 |
9 |
10 echo "# initial file contents" |
10 echo "# initial file contents" |
11 echo "line 1" > f |
11 echo "line 1" > f |
12 echo "line 2" >> f |
12 echo "line 2" >> f |
13 echo "line 3" >> f |
13 echo "line 3" >> f |
14 hg commit -Am "revision 0" -d "1000000 0" |
14 hg commit -Am "revision 0" |
15 cat f |
15 cat f |
16 echo "# branch 1: editing line 1" |
16 echo "# branch 1: editing line 1" |
17 sed 's/line 1/first line/' f > f.new |
17 sed 's/line 1/first line/' f > f.new |
18 mv f.new f |
18 mv f.new f |
19 hg commit -Am "edited first line" -d "1000000 0" |
19 hg commit -Am "edited first line" |
20 |
20 |
21 echo "# branch 2: editing line 3" |
21 echo "# branch 2: editing line 3" |
22 hg update 0 |
22 hg update 0 |
23 sed 's/line 3/third line/' f > f.new |
23 sed 's/line 3/third line/' f > f.new |
24 mv f.new f |
24 mv f.new f |
25 hg commit -Am "edited third line" -d "1000000 0" |
25 hg commit -Am "edited third line" |
26 |
26 |
27 echo "# merge using internal:fail tool" |
27 echo "# merge using internal:fail tool" |
28 echo "[merge-patterns]" > .hg/hgrc |
28 echo "[merge-patterns]" > .hg/hgrc |
29 echo "* = internal:fail" >> .hg/hgrc |
29 echo "* = internal:fail" >> .hg/hgrc |
30 hg merge |
30 hg merge |