diff hgwebdir.cgi @ 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 6033d9f28052
children 55860a45bbf2
line wrap: on
line diff