comparison hg @ 5172:f53d97d651f4

Use smerge minor mode in emacs to resolve conflicts. The condition-case is used to suppress errors with emacs versions before 21.
author Sascha Wilde <wilde@sha-bang.de>
date Wed, 15 Aug 2007 17:27:51 +0200
parents 63b9d2deed48
children 18a9fbb5cd78
comparison
equal deleted inserted replaced
5171:de7c772751b4 5172:f53d97d651f4