From: <don...@is...> - 2017-08-06 02:03:50
|
Bruno Haible writes: > Don Cohen wrote: > > pulling from http://hg.code.sf.net/p/clisp/clisp > > searching for changes > > adding changesets > > adding manifests > > adding file changes > > added 1 changesets with 4 changes to 4 files > > abort: outstanding merge conflicts > > Have you checked the various status commands? No, I didn't even know about them. However, when I now do $ hg pull -u pulling from http://hg.code.sf.net/p/clisp/clisp searching for changes no changes found So I expect all is well and all these other commands won't tell me anything more about what was wrong. |