Commits

Martin Geisler committed 994a0ce

Test merge

Comments (0)

Files changed (1)

   $ hg -R ../clone killed --alive
   Killed changesets:
     6372dae45110 (alive)
+
+Test merge:
+
+  $ hg kill .
+  Killing 1 changesets
+
+  $ hg phase 0:tip
+  0: public
+  1: public
+  2: secret
+  $ hg killed --alive
+  Killed changesets:
+    6372dae45110
+
+  $ hg merge
+  merging a
+  warning: conflicts during merge.
+  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
+  [1]
+  $ echo aa-aaa > a
+  $ hg resolve --mark a
+  $ hg commit -m merge
+
+  $ hg phase 0:tip
+  0: public
+  1: public
+  2: secret
+  3: secret
+
+  $ hg killed --alive
+  Killed changesets:
+    6372dae45110
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.