Can't figure out how to overcome binary merge

[Eric Haszlakiewicz]

>-----Original Message-----
>From: mercurial-bounces at selenic.com
[mailto:mercurial-bounces at selenic.com]
>
>Somehow I got two heads in my repository, and when I try merging them,
I
>get
>
>merging tools/safari/dtd.xlsx
>abort: /home/cay/books/cj9/mercurial/tools/safari/dtd.xlsx looks like
>a binary file.
>
>Ok, so I tell it to trust the version that I have.
>
>hg resolve tools/safari/dtd.xlsx

Careful, the "hg resolve" command (with no options) doesn't actually
mean "resolve", it means "perform a merge" (which is a great way to lose
any work you've done actually sorting out conflicting merges).

eric