Mercurial > emacs
diff MAINTAINERS @ 82007:c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 20 Jul 2007 20:41:58 +0000 |
parents | b28700641d1c |
children | da43d143db40 d7172f202ab8 |