1 adding file1

     2 adding file2

     3 2 files updated, 0 files merged, 0 files removed, 0 files unresolved

     4 

     5 # non-interactive merge

     6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved

     7 (branch merge, don't forget to commit)

     8 status:

     9 M file2

    10 C file1

    11 file1:

    12 1

    13 changed

    14 file2:

    15 2

    16 changed

    17 

    18 # interactive merge

    19 0 files updated, 0 files merged, 1 files removed, 0 files unresolved

    20  local changed file1 which remote deleted

    21 use (c)hanged version or (d)elete? remote changed file2 which local deleted

    22 use (c)hanged version or leave (d)eleted? 0 files updated, 0 files merged, 0 files removed, 0 files unresolved

    23 (branch merge, don't forget to commit)

    24 status:

    25 file2: No such file or directory

    26 C file1

    27 file1:

    28 1

    29 changed

    30 file2 does not exist

    31 

    32 # interactive merge with bad input

    33 0 files updated, 0 files merged, 0 files removed, 0 files unresolved

    34  local changed file1 which remote deleted

    35 use (c)hanged version or (d)elete? unrecognized response

    36  local changed file1 which remote deleted

    37 use (c)hanged version or (d)elete? unrecognized response

    38  local changed file1 which remote deleted

    39 use (c)hanged version or (d)elete? remote changed file2 which local deleted

    40 use (c)hanged version or leave (d)eleted? unrecognized response

    41 remote changed file2 which local deleted

    42 use (c)hanged version or leave (d)eleted? 1 files updated, 0 files merged, 1 files removed, 0 files unresolved

    43 (branch merge, don't forget to commit)

    44 status:

    45 M file2

    46 R file1

    47 file1 does not exist

    48 file2:

    49 2

    50 changed

    51 

    52 # interactive merge with not enough input

    53 1 files updated, 0 files merged, 1 files removed, 0 files unresolved

    54  local changed file1 which remote deleted

    55 use (c)hanged version or (d)elete? remote changed file2 which local deleted

    56 use (c)hanged version or leave (d)eleted? abort: response expected

    57 failed

    58 status:

    59 file2: No such file or directory

    60 C file1

    61 file1:

    62 1

    63 changed

    64 file2 does not exist