mercurial/__init__.py
author Sascha Wilde <wilde@sha-bang.de>
Wed, 15 Aug 2007 17:27:51 +0200
changeset 5171 f53d97d651f4
parent 0 9117c6561b0b
permissions -rw-r--r--
Use smerge minor mode in emacs to resolve conflicts. The condition-case is used to suppress errors with emacs versions before 21.