"0 conflicts encountered."

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Matthieu Moy wrote:
>>I'm not sure.  I actually prefer three-way diffs, most of the time
>>- they give you a BASE file, so you can see what changes OTHER made.
> 
> 
> AAUI, --merge-type does a 3-way merge at the file granularity (file
> names and meta-information), and a weave merge for file content. So,
> it shouldn't be difficult to put a file.BASE in the tree in case of
> conflict, right? (but I guess getting the ancestor in the conflict
> markers would be meaningless)

Exactly.  Maybe we shouldn't care that the BASE wasn't involved in the
merge, but if we do generate a BASE file, then we always have to find
the merge BASE, even if there are no tree-shape differences.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDkLuS0F+nu1YWqI0RAo45AJ9M4L5MhFi3Vf9U6e3R1aopOkcm8ACfZX+e
hMzxVTvGiAcbOjQSsekCF6w=
=fv3r
-----END PGP SIGNATURE-----