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

test-compat: back out changeset 0d65a5e96691

parent 44d99ec38ecb
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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment