1 adding file1 |
|
2 adding file2 |
|
3 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4 created new head |
|
5 |
|
6 # non-interactive merge |
|
7 local changed file1 which remote deleted |
|
8 use (c)hanged version or (d)elete? c |
|
9 remote changed file2 which local deleted |
|
10 use (c)hanged version or leave (d)eleted? c |
|
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
12 (branch merge, don't forget to commit) |
|
13 status: |
|
14 M file2 |
|
15 C file1 |
|
16 file1: |
|
17 1 |
|
18 changed |
|
19 file2: |
|
20 2 |
|
21 changed |
|
22 |
|
23 # interactive merge |
|
24 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
25 local changed file1 which remote deleted |
|
26 use (c)hanged version or (d)elete? remote changed file2 which local deleted |
|
27 use (c)hanged version or leave (d)eleted? 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
28 (branch merge, don't forget to commit) |
|
29 status: |
|
30 file2: No such file or directory |
|
31 C file1 |
|
32 file1: |
|
33 1 |
|
34 changed |
|
35 file2 does not exist |
|
36 |
|
37 # interactive merge with bad input |
|
38 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
39 local changed file1 which remote deleted |
|
40 use (c)hanged version or (d)elete? unrecognized response |
|
41 local changed file1 which remote deleted |
|
42 use (c)hanged version or (d)elete? unrecognized response |
|
43 local changed file1 which remote deleted |
|
44 use (c)hanged version or (d)elete? remote changed file2 which local deleted |
|
45 use (c)hanged version or leave (d)eleted? unrecognized response |
|
46 remote changed file2 which local deleted |
|
47 use (c)hanged version or leave (d)eleted? 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
48 (branch merge, don't forget to commit) |
|
49 status: |
|
50 M file2 |
|
51 R file1 |
|
52 file1 does not exist |
|
53 file2: |
|
54 2 |
|
55 changed |
|
56 |
|
57 # interactive merge with not enough input |
|
58 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
59 local changed file1 which remote deleted |
|
60 use (c)hanged version or (d)elete? remote changed file2 which local deleted |
|
61 use (c)hanged version or leave (d)eleted? abort: response expected |
|
62 failed |
|
63 status: |
|
64 file2: No such file or directory |
|
65 C file1 |
|
66 file1: |
|
67 1 |
|
68 changed |
|
69 file2 does not exist |
|