23 Jun
2008
23 Jun
'08
12:35 p.m.
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.