>>>>> "vila" == Vincent LADEUIL <[EMAIL PROTECTED]> writes:
<snip/>
vila> But.... I just did 'baz update' in my work dir
vila> 'dvc.stefan' and now all my modifications are inside
vila> .rej files :(
vila> And worse, I have no idea on how to review your mods
vila> and choose which of mine I want to keep (in that
vila> particular case, I read your mods and see nothing I
vila> don't want but...).
vila> What should I have done ?
I sould have done 'M-x baz-update', shouldn't I ? :-/
I just tried that in another branch...
Now, what is the best way to get rid of all those .orig and .rej
files ?
Vincent
