Wed, 15 Aug 2007 17:27:51 +0200 Use smerge minor mode in emacs to resolve conflicts.
Sascha Wilde <wilde@sha-bang.de> [Wed, 15 Aug 2007 17:27:51 +0200] rev 5171
Use smerge minor mode in emacs to resolve conflicts. The condition-case is used to suppress errors with emacs versions before 21.
(0) -3000 -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 tip