Loading
#openttdcoop - Paste
Archives
Trending
Docs
Login
Paste #phei0hx40
Wrap
Raw
Revise
(
bin35
)
iron-horse$ hg up tip
abort: outstanding merge conflicts
(
bin35
)
iron-horse$ hg merge
--abort
abort: no merge
in
progress
Comments