Yeah, this is a little awkward, because by default hg assumes you can hit Ctrl-C in the terminal to interrupt the process. But with vim opening in the same terminal it's difficult to do. It works better in case of GUI merge tools. But if you want to resolve conflicts in vim, take a look at `hg help config.merge.on-failure`. _______________________________________________ Mercurial mailing list Mercurial@lists.mercurial-scm.org https://lists.mercurial-scm.org/mailman/listinfo/mercurial
- Complete stop of the merge process during manual resolving... Kaminar
- Re: Complete stop of the merge process during manual ... Anton Shestakov
