On Saturday, 28 January 2006 at 14:07, Brendan Cully wrote:
> On Saturday, 28 January 2006 at 23:00, Mercurial Commits wrote:
> > 2 new changesets in mercurial:
> >
> > http://www.selenic.com/hg/?cs=64a1169c927d
> > changeset: 1647:64a1169c927d
> > user: Christian Ebert <blacktrash@xxxxxxx>
> > date: Sun Jan 29 10:10:00 2006 +1300
> > summary: Use of opendiff as merge program on MacOS X
>
> I don't think this version is safe - it doesn't distinguish between
> good and bad merges. There's a thread about it at
> http://www.selenic.com/pipermail/mercurial/2006-January/006102.html
Here's the version from the wiki.
hg-opendiff.patch
Description: Text document
|
