Skip to content
Snippets Groups Projects
Commit 72d88e491a19 authored by Anton Shestakov's avatar Anton Shestakov
Browse files

test-compat: merge mercurial-5.5 into mercurial-5.4

# no-check-commit
No related branches found
No related tags found
No related merge requests found
......@@ -127,7 +127,7 @@
merging file
warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
switching to topic myotherfeature
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
Resolve the conflict
......
......@@ -54,6 +54,5 @@
Enabled extensions:
evolve external * (glob)
rebase internal
topic external * (glob)
......@@ -58,5 +57,6 @@
rebase internal
topic external * (glob)
evolve external * (glob)
$ hg clone ssh://user@dummy/server client-plain
requesting all changes
adding changesets
......@@ -81,4 +81,5 @@
Enabled extensions:
rebase internal
evolve external * (glob)
......@@ -84,5 +85,4 @@
evolve external * (glob)
rebase internal
Make two commits, with and without a topic, and push them to the server
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment