Re: svn commit: r1470238 - /subversion/trunk/subversion/svn/conflict-callbacks.c
I (Julian Foad) wrote:
> Daniel Shahaf wrote:
>> Have you considered flipping the order to
>> --- relpath/to/file.r123\t- THEIRS
>> +++ relpath/to/file\t- MERGED
>> (with a real tab instead of \t)? This would allow copy-pasting the
>> displayed diff into 'patch -i -' (or, presumably, any other patch-aware
>> tools which expect "--- %(filename)s\t%(label)s\n" headers).
> That looks good to me (and hasn't been discussed). I'll do it.
r1471153, and added to the 1.8.x nomination in r1471154.
Received on 2013-04-23 23:35:33 CEST
This is an archived mail posted to the Subversion Dev