log hgmerge @ 5483:0c43f87baba3 default tip

age author description
Wed, 15 Aug 2007 17:27:51 +0200 Sascha Wilde Use smerge minor mode in emacs to resolve conflicts.
Sun, 08 Jul 2007 13:44:41 +0200 Thomas Arendsen Hein Check for conflict markers in hgmerge (issue471)