On 2/11/11 4:47 PM, David Roe wrote:
It will sometimes happen that the rebase extension can't figure out
how to merge your patches, so then it should launch whatever 3-way
merge tool you have configured for mercurial to use (such as kdiff3 or
vimdiff), allowing you to supervise the merge process. If you quit the
merge without resolving the conflict, you can then either use `hg
rebase --abort` to revert the repository to how it looked after step
5) above, or use `hg rebase --continue` to relaunch the merge tool.
Thanks for the tip. Does anyone know a good 3-way merge program that works
on OS X?
I've used kdiff3. It's not pretty compared to some other osx apps, but
it works well.
Thanks,
Jason
--
To post to this group, send an email to sage-devel@googlegroups.com
To unsubscribe from this group, send an email to
sage-devel+unsubscr...@googlegroups.com
For more options, visit this group at http://groups.google.com/group/sage-devel
URL: http://www.sagemath.org
