Conflicts on .hgtags, but no revisions on chevron markers?

[Giorgos Keramidas]

On Tue, 10 Nov 2009 12:45:20 -0800, Clint Olsen <clint.olsen at gmail.com> wrote:
> Can you suggest a merge tool?  I've found merge/diff on Linux &
> FreeBSD to be a real mixed bag.

I normally use the three-way merge of Ediff in Emacs.

It's easier for me to have all 3 files in separate buffers, and ediff
highlights line differences in "fine diff" mode, showing changes smaller
than a full line of text with a different face/color.

The attached shell script tries to do a trivial merge with diff3(1)
first.  If the trivial merge fails with conflicts, it launches Emacs in
three-way ediff-mode with 3 buffers for the local version (left pane),
the other head (right pane) and a merge buffer below the two heads.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: ediff-merge
Type: text/x-sh
Size: 5819 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial/attachments/20091111/648a9c39/attachment.sh>
-------------- next part --------------

The merge-tools section of my ~/.hgrc launches this merge script with:

  [merge-tools]
  ediff.priority = 10
  ediff.premerge = True
  ediff.binary = False
  ediff.gui = False
  ediff.executable = /home/keramida/bin/ediff-merge
  ediff.args = $local $base $other

HTH,
Giorgos