http://bugs.grommit.com/show_bug.cgi?id=269
------- Comment #8 from richlowe at richlowe.net 2007-10-03 23:32 PDT ------- imerge seems suitable, though the interface is somewhat clunky. Rather than 'hg merge', 'hg imerge' this will set you up to merge, but do nothing. Then 'hg imerge', will prompt you to resolve the first file that needs it, then exit You must run it repeatedly until done. the 'hg imerge <command>' syntax only works after the initial 'hg imerge'. Does someone want to experiment further with this and try and push fixes back to Mercurial (or brendan)? -- Configure bugmail: http://bugs.grommit.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee.
