Fwd: mercurial & binary files

Douglas Philips dgou at mac.com
Mon Jul 28 08:16:42 CDT 2008


On or about 2008 Jul 28, at 9:02 AM, Marko Käning inquired:
> Is there a way to tell hg that a certain file has to be treated as an
> unmergable binary?

You might want to configure merge-patterns in your .ini:
http://www.selenic.com/mercurial/wiki/index.cgi/MergeToolConfiguration
http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram

--Doug




More information about the Mercurial mailing list