Yeah, I was thinking like emacs ediff mode. I understand that this situation can't automatically be resolved, but something like ediff would be better than what is popping up now. I will try setting my editor and reading the mercurial documentation. I think I saw a section on this.
On Mon, Jun 23, 2008 at 11:35 AM, Robert Cimrman <cimr...@ntc.zcu.cz> wrote:
Ryan Krauss wrote:
No problem. That is what I was doing (manual editting). I just thought there had to be an easier way.
Well, IMHO there is not. A conflict means that two people edited the same thing in an incompatible manner - no tool can resolve this automatically. Or you mean that hg just prints the info and does not open a text editor with the offending file? Maybe you should set EDITOR environment variable, like export EDITOR=<path to your favourite text editor> for the bash shell. Then, your editor may know how to move between the conflict marks.
r.