log hgmerge @ 5245:0d28d4e5fe1f

age author description
Wed, 15 Aug 2007 17:27:51 +0200 Sascha Wilde Use smerge minor mode in emacs to resolve conflicts.