tests/test-conflict.out
author Robin Farine <robin.farine@terminus.org>
Wed, 28 Sep 2005 19:42:03 +0200
changeset 1371 68e84563c540
parent 925 5a034646e472
child 1933 7544700fd931
permissions -rw-r--r--
emacs minor mode optional argument With GNU Emacs 21.4.1 and desktop save/restore enabled, loading "mercurial.el" from ".emacs" breaks Emacs' initialization sequence when the desktop restore code loads a file under Mercurial control. The function 'desktop-create-buffer' passes an argument to each minor mode it activates for the buffer.

merge: warning: conflicts during merge
merging a
merging a failed!
32e80765d7fe+75234512624c+ tip
something else
=======
something
M a