P3D2::Merging binary file takes local by default

Issue #146 open
Kijun Seo
created an issue

I'm trying to merge two revisions that have a binary file conflict. MacHg always takes the local file, and I can't find a way to change this behavior.

Does MacHg offer a way to choose local/other revision? Thank you.

Comments (6)

  1. Jason Harris repo owner
    • changed status to open

    I need to investigate this... I am about to enhance the selection of diff tools, etc and will investigate if this is a problem with just FileMerge or a general problem in MacHg.

    Thanks for the report! Jas

  2. Jason Harris repo owner

    You can now specify the merge tool. You just need to choose a merge tool which handles binary files. Eg Araxis Merge will merge binary files. I'll drop the priority on this consequently...

  3. Log in to comment