Conflict handling

[Robey Pointer]

On 13 Feb 2006, at 7:47, Vincent LADEUIL wrote:

>>>>>> "Aaron" == Aaron Bentley <aaron.bentley at utoronto.ca> writes:
>
>     Aaron> I guess I'm now leaning towards the notion of storing
>     Aaron> the conflict files in a separate directory, and only
>     Aaron> producing (copies of) them at the user's request.
>     Aaron> Certainly, my experience is that I usually don't want
>     Aaron> .BASE, .THIS and .OTHER.
>
>     Aaron> How does that sound?
>
> Just great.

+1 to making .BASE (&c) optional.

robey