comparison tests/test-merge-types.t @ 30062:940c05b25b07

merge: add conflict labels to merge command

Now that we present the conflict labels in prompts, it's useful to have
better names than "local" and "other" for every command.

30061:8e805cf27caa

  U d
  U f
  U h
  $ tellmeabout a
  a is a plain file with content:
  <<<<<<< local: 0139c5610547 - test: 2
  2
  =======
  1
  >>>>>>> other: 97e29675e796  - test: 1
  $ tellmeabout b
  b is a plain file with content:
  <<<<<<< local: 0139c5610547 - test: 2
  2
  =======
  1
  >>>>>>> other: 97e29675e796  - test: 1
  $ tellmeabout c
  c is a plain file with content:
  x
  $ tellmeabout d
  d is a symlink:

  3 files updated, 0 files merged, 0 files removed, 5 files unresolved
  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
  [1]
  $ tellmeabout a
  a is a plain file with content:
  <<<<<<< local: 97e29675e796  - test: 1
  1
  =======
  2
  >>>>>>> other: 0139c5610547 - test: 2
  $ tellmeabout b
  b is an executable file with content:
  <<<<<<< local: 97e29675e796  - test: 1
  1
  =======
  2
  >>>>>>> other: 0139c5610547 - test: 2
  $ tellmeabout c
  c is an executable file with content:
  x
  $ tellmeabout d
  d is an executable file with content:

30062:940c05b25b07

  U d
  U f
  U h
  $ tellmeabout a
  a is a plain file with content:
  <<<<<<< working copy: 0139c5610547 - test: 2
  2
  =======
  1
  >>>>>>> merge rev:    97e29675e796  - test: 1
  $ tellmeabout b
  b is a plain file with content:
  <<<<<<< working copy: 0139c5610547 - test: 2
  2
  =======
  1
  >>>>>>> merge rev:    97e29675e796  - test: 1
  $ tellmeabout c
  c is a plain file with content:
  x
  $ tellmeabout d
  d is a symlink:

  3 files updated, 0 files merged, 0 files removed, 5 files unresolved
  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
  [1]
  $ tellmeabout a
  a is a plain file with content:
  <<<<<<< working copy: 97e29675e796  - test: 1
  1
  =======
  2
  >>>>>>> merge rev:    0139c5610547 - test: 2
  $ tellmeabout b
  b is an executable file with content:
  <<<<<<< working copy: 97e29675e796  - test: 1
  1
  =======
  2
  >>>>>>> merge rev:    0139c5610547 - test: 2
  $ tellmeabout c
  c is an executable file with content:
  x
  $ tellmeabout d
  d is an executable file with content: