How to automatically merge .hgtags in Mercurial?

Question

I have a script running some Mercurial commands in non-interactive mode on a build server. One of the commands merges two branches and there is always a conflict in the

Answer 1

You should try diffmerge, it's awesome!