equal
deleted
inserted
replaced
10 |
10 |
11 echo foo > foo |
11 echo foo > foo |
12 echo bar > bar |
12 echo bar > bar |
13 hg ci -Am0 -d '0 0' |
13 hg ci -Am0 -d '0 0' |
14 |
14 |
15 echo foo >> foo |
15 hg mv foo foo2 |
|
16 echo foo >> foo2 |
16 hg ci -m1 -d '1 0' |
17 hg ci -m1 -d '1 0' |
17 |
18 |
18 hg up -C 0 |
19 hg up -C 0 |
19 echo bar >> foo |
20 echo bar >> foo |
20 echo bar >> bar |
21 echo bar >> bar |
21 hg ci -m2 -d '2 0' |
22 hg ci -m2 -d '2 0' |
22 |
23 |
23 echo % start imerge |
24 echo % start imerge |
24 hg imerge |
25 hg imerge |
25 |
26 |
26 cat foo |
27 cat foo2 |
27 cat bar |
28 cat bar |
28 |
29 |
29 echo % status |
30 echo % status |
30 hg imerge st |
31 hg imerge st |
31 |
32 |
|
33 echo % next |
|
34 hg imerge next |
|
35 |
32 echo % merge next |
36 echo % merge next |
33 hg imerge |
37 hg --traceback imerge |
34 |
38 |
35 echo % unresolve |
39 echo % unresolve |
36 hg imerge unres foo |
40 hg imerge unres foo |
37 |
41 |
38 echo % merge foo |
42 echo % merge foo |
39 hg imerge merge foo |
43 hg imerge merge foo |
40 |
44 |
41 echo % save |
45 echo % save |
42 echo foo > foo |
46 echo foo > foo2 |
43 hg imerge save ../savedmerge |
47 hg imerge save ../savedmerge |
44 |
48 |
45 echo % load |
49 echo % load |
46 hg up -C 0 |
50 hg up -C 0 |
47 hg imerge --traceback load ../savedmerge |
51 hg imerge --traceback load ../savedmerge |
48 cat foo |
52 cat foo2 |
49 |
53 |
50 hg ci -m'merged' -d '3 0' |
54 hg ci -m'merged' -d '3 0' |
51 hg tip -v |
55 hg tip -v |
52 |
56 |
53 echo % nothing to merge |
57 echo % nothing to merge |