Mercurial > hg
view tests/test-double-merge.out @ 8386:4aad982111b6
inotify: Abstract the layer format and sizes to a inotify.common dictionary
Instead of having a single possible request format, introduce a dictionary
of possible messages in inotify.common
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Thu, 14 May 2009 15:48:47 +0200 |
parents | 368a4ec603cc |
children | 50b6af595e0c |
line wrap: on
line source
created new head 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