Vincent LADEUIL <v.ladeuil at alplog.fr> writes: > I know, I currently work with dvc under emacs :-) Indeed, the presence of the .BASE file allows you to do a real three-way merge with ediff3. That's not (yet) in DVC, but M-x ediff3 RET can help. -- Matthieu