(change-log-resolve-conflict): Don't lose data if the merge fails.
authorStefan Monnier <monnier@iro.umontreal.ca>
Fri, 20 Jul 2007 20:41:58 +0000 (20:41 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Fri, 20 Jul 2007 20:41:58 +0000 (20:41 +0000)
commit74dea9e1c1ca344e0542cfbd751707641d69375e
tree73b7324475f4999526e05b1fb786fb33a10713ac
parentbb042dc6fab52bd691b520b03ee61be7718664c0
(change-log-resolve-conflict): Don't lose data if the merge fails.
lisp/ChangeLog
lisp/add-log.el