[PATCH 0 of 1] Add rudimentary merge handling to hgmerge for binary files.

Mitch Frazier mitch at ssc.com
Wed Nov 2 13:19:42 UTC 2005


This is a patch to hgmerge which tests files that need be merged to see
if they are binary.  If they are then hgmerge prompts the user to
pick one of the two files or to continue with the normal merge process.

Picking one or the other is not much of a merge, but for JPGs, PNGs,
and other binary files its probably what one would normally want:
either your version or their version.  In any case its better than
trying to merge them with vi.




More information about the Mercurial mailing list