Re: Using --diff-cmd=/usr/bin/diff3 says merGed but is Conflict

Philip Martin <[email protected]> Sun, 16 Oct 2005 15:48:15 +0100

Newsgroups	gmane.comp.version-control.subversion.devel,gmane.mail.eyebrowse.user
Message-ID	<87psq58qmo.fsf__22590.1085570969$1129474294$gmane$org@debian2.lan>

"Max Bowsher" <[email protected]> writes:

>> +++ subversion/libsvn_wc/update_editor.c (working copy)
>> @@ -2203,7 +2203,7 @@
>>                                      svn_path_join (base, base_name,
>> pool),
>>                                      adm_access,
>>                                      oldrev_str, newrev_str, ".mine",
>> -                                     TRUE, &merge_outcome, NULL,
>> +                                     TRUE, &merge_outcome, diff3_cmd,
>>                                      pool));
>>
>>             } /* end: working file exists and has mods */
>
> Nope, it's an intentional and rather nasty hack.

It's not documented, and the issue is "fixed" :-(

-- 
Philip Martin