Conflict handling

[Vincent LADEUIL]

>>>>> "Matthieu" == Matthieu Moy <Matthieu.Moy at imag.fr> writes:

    Matthieu> Vincent LADEUIL <v.ladeuil at alplog.fr> writes:
    >> I know, I currently work with dvc under emacs :-)

    Matthieu> Indeed, the presence of the .BASE file allows you
    Matthieu> to do a real three-way merge with ediff3. That's
    Matthieu> not (yet) in DVC,

As soon as I get conflicts in my project I will hack on it :)

    Matthieu> but M-x ediff3 RET can help.

Ok.

        Vincent