On Mon, 21 Jul 2008, Mark J. Nelson wrote: > You generally want to make sure that your .hgrc file is setup to point to a > valid, graphical filemerge tool. Then just run "hg merge."
Yeah, that's what I thought and added this: [merge-tools] meld.gui=True meld.priority=0 I do have meld in the path and can execute it, but it doesn't seem to give me the merge tool for some reason. > Mercurial will automatically include files from both parent changesets, > and even automatically merge file changed in both. When it can't do > that (because changes overlap), it will start a graphical file merge > tool for each such conflicting file. Yeah, that would be nice and what I had expected with the above. > If you insist on a more manual approach, you can do "hg status -mard --rev > 6362:6972," but I don't think that will really make you happy. I guess if the merge tool would work, I'm ok with that. Would it be looking for something different than meld in the path? -- Alan DuBoff - Solaris x86 IHV/OEM Group
