view tests/test-double-merge.out @ 8625:34754aa62cd8

Makefile: do not create i18n/, it is already there

created new head
changeset:   0:310fd17130da
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     add foo

changeset:   1:7731dad1c2b9
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     cp foo bar; change both

resolving manifests
 overwrite None partial False
 ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9
  searching for copies back to rev 1
  unmatched files in other:
   bar
  all copies found (* = to merge, ! = divergent):
   bar -> foo *
  checking for directory renames
 foo: versions differ -> m
 foo: remote copied to bar -> m
preserving foo for resolve of bar
preserving foo for resolve of foo
picked tool 'internal:merge' for bar (binary False symlink False)
merging foo and bar to bar
my bar@2092631ce82b+ other bar@7731dad1c2b9 ancestor foo@310fd17130da
 premerge successful
picked tool 'internal:merge' for foo (binary False symlink False)
merging foo
my foo@2092631ce82b+ other foo@7731dad1c2b9 ancestor foo@310fd17130da
 premerge successful
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
-- foo --
line 0
line 1
line 2-1
-- bar --
line 0
line 1
line 2-2