equal
deleted
inserted
replaced
2 adding file2 |
2 adding file2 |
3 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4 created new head |
4 created new head |
5 |
5 |
6 # non-interactive merge |
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 |
7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
8 (branch merge, don't forget to commit) |
12 (branch merge, don't forget to commit) |
9 status: |
13 status: |
10 M file2 |
14 M file2 |
11 C file1 |
15 C file1 |