tests/test-merge-types.t
changeset 30062 940c05b25b07
parent 29774 a7f8939641aa
child 30160 008c4ce64e3f
equal deleted inserted replaced
30061:8e805cf27caa 30062:940c05b25b07
   354   U d
   354   U d
   355   U f
   355   U f
   356   U h
   356   U h
   357   $ tellmeabout a
   357   $ tellmeabout a
   358   a is a plain file with content:
   358   a is a plain file with content:
   359   <<<<<<< local: 0139c5610547 - test: 2
   359   <<<<<<< working copy: 0139c5610547 - test: 2
   360   2
   360   2
   361   =======
   361   =======
   362   1
   362   1
   363   >>>>>>> other: 97e29675e796  - test: 1
   363   >>>>>>> merge rev:    97e29675e796  - test: 1
   364   $ tellmeabout b
   364   $ tellmeabout b
   365   b is a plain file with content:
   365   b is a plain file with content:
   366   <<<<<<< local: 0139c5610547 - test: 2
   366   <<<<<<< working copy: 0139c5610547 - test: 2
   367   2
   367   2
   368   =======
   368   =======
   369   1
   369   1
   370   >>>>>>> other: 97e29675e796  - test: 1
   370   >>>>>>> merge rev:    97e29675e796  - test: 1
   371   $ tellmeabout c
   371   $ tellmeabout c
   372   c is a plain file with content:
   372   c is a plain file with content:
   373   x
   373   x
   374   $ tellmeabout d
   374   $ tellmeabout d
   375   d is a symlink:
   375   d is a symlink:
   407   3 files updated, 0 files merged, 0 files removed, 5 files unresolved
   407   3 files updated, 0 files merged, 0 files removed, 5 files unresolved
   408   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   408   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   409   [1]
   409   [1]
   410   $ tellmeabout a
   410   $ tellmeabout a
   411   a is a plain file with content:
   411   a is a plain file with content:
   412   <<<<<<< local: 97e29675e796  - test: 1
   412   <<<<<<< working copy: 97e29675e796  - test: 1
   413   1
   413   1
   414   =======
   414   =======
   415   2
   415   2
   416   >>>>>>> other: 0139c5610547 - test: 2
   416   >>>>>>> merge rev:    0139c5610547 - test: 2
   417   $ tellmeabout b
   417   $ tellmeabout b
   418   b is an executable file with content:
   418   b is an executable file with content:
   419   <<<<<<< local: 97e29675e796  - test: 1
   419   <<<<<<< working copy: 97e29675e796  - test: 1
   420   1
   420   1
   421   =======
   421   =======
   422   2
   422   2
   423   >>>>>>> other: 0139c5610547 - test: 2
   423   >>>>>>> merge rev:    0139c5610547 - test: 2
   424   $ tellmeabout c
   424   $ tellmeabout c
   425   c is an executable file with content:
   425   c is an executable file with content:
   426   x
   426   x
   427   $ tellmeabout d
   427   $ tellmeabout d
   428   d is an executable file with content:
   428   d is an executable file with content: