[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Conflicts in rmail.el
From: |
Stefan Monnier |
Subject: |
Re: Conflicts in rmail.el |
Date: |
Tue, 15 Nov 2011 16:46:09 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.91 (gnu/linux) |
>> could someone fix existings conflicts in rmail.el?
> Just "bzr revert" and move on.
Well, "bzr revert" throws away all the changes you may have, so it's not
necessarily a good idea. But yes: those conflict are resolved by
choosing any of the three options (and I really mean any: it shouldn't
matter much which one you choose).
Stefan