filemerge: A feature request
steve at borho.org
Wed Feb 6 00:51:13 CST 2008
On Wed, 2008-02-06 at 12:01 +0530, dhruva wrote:
> since there is a function to check the file type (if binary based on
> embedded nulls), i was wondering if it made sensee to have it in core
filemerge does consult util.binary() to determine whether a tool can
merge a particular file. By default, merge tools are assumed to not be
capable of handling binary files so unless you've manually specified a
tool that can handle binary files, filemerge falls back to giving the
user a choice between the local and other versions.
You can specify a binary merging tool in the merge-tools specification.
mytool.args = $local $base $other
mytool.binary = true
However, there's no explicit way to say: binary -> internal:local
I can't say if that's a generic enough feature to warrant inclusion,
when you can get there through other means.
Steve Borho (steve at borho.org)
Key fingerprint = 2D08 E7CF B624 624C DE1F E2E4 B0C2 5292 F2C6 2C8C
More information about the Mercurial-devel