Ben Collins-Sussman <sussman@collab.net> writes:
> I personally like the 3-part markers, but Karl likes the 2-part ones.
> But guess what? This is a preference that a user ought to be able to
> configure in the ~/.subversion/ area. I think I'll file an issue on
> this. :-)
You know, I think I prefer the 3-part too. Does anyone strongly
prefer the other way? If not, perhaps we should wait on making this
configurable, and just default to 3-part conflict regions...
-K
> Here's sample output, by the way:
>
> [sussman@kepler:~/projects/test/wc2]$ /usr/bin/diff3 -E -m -L ".mine" -L ".r1" -L ".r4" ./iota.61032.00001.tmp ./.svn/text-base/iota.svn-base ./.svn/tmp/text-base/iota.svn-base
> <<<<<<< .mine
> This is the file 'iota'.maoeuhaoeuht
> =======
> This is the file 'iota'.blah
> >>>>>>> .r4
> [sussman@kepler:~/projects/test/wc2]$ /usr/bin/diff3 -A -m -L ".mine" -L ".r1" -L ".r4" ./iota.61032.00001.tmp ./.svn/text-base/iota.svn-base ./.svn/tmp/text-base/iota.svn-base
> <<<<<<< .mine
> This is the file 'iota'.maoeuhaoeuht
> ||||||| .r1
> This is the file 'iota'.
> =======
> This is the file 'iota'.blah
> >>>>>>> .r4
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Mar 12 21:35:30 2002