Merging the unmergable

From: Miller, Eric <Eric.Miller_at_amd.com>
Date: 2007-09-11 18:47:54 CEST

Does anyone know if there is a way to specify a merge script for binary
files? The --diff3-cmd switch only seems to work on text files.

Thanks!

Eric

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Sep 11 18:46:14 2007

This message: [ Message body ]
Next message: Kris Deugau: "Re: Unable to cause a conflict in branch merge test"
Previous message: AlarmChang: "Re: can't get post-commit.bat to execute in win32"
Next in thread: Miller, Eric: "RE: Merging the unmergable"
Maybe reply: Miller, Eric: "RE: Merging the unmergable"

Contemporary messages sorted: [ By Date ] [ By Thread ] [ By Subject ] [ By Author ] [ By messages with attachments ]