Binary diff/merge proposal

[jbowtie at amathaine.com]

On Thu, Oct 14, 2010 at 1:20 AM, Gordon Tyler <gordon at doxxx.net> wrote:
>
> Why does it matter whether a merge tool supplies a GUI?
>

For text merges, it doesn't really matter - you can just open up the
file and resolve conflicts manually. For binary formats however
(especially those that touch very complex formats) it may be the only
way to actually do conflict resolution. Without this the goal of
becoming useful for artists fails.