Vincent LADEUIL <[EMAIL PROTECTED]> writes: > I sould have done 'M-x baz-update', shouldn't I ? :-/
Yes, it will run the right command (by default, merge, as I suggested), see `tla-update-strategy'. > Now, what is the best way to get rid of all those .orig and .rej > files ? http://wiki.gnuarch.org/Process_20_2a_2erej_20files If you don't want the changes in those .rej files anymore, just "rm" them. Or M-x baz-resolved RET from a .rej or a conflicted file. -- Matthieu
