--- a/hgext/fetch.py Sat Aug 02 21:46:26 2014 +0900
+++ b/hgext/fetch.py Sat Aug 02 21:46:26 2014 +0900
@@ -143,8 +143,8 @@
('Automated merge with %s' %
util.removeauth(other.url())))
editopt = opts.get('edit') or opts.get('force_editor')
- n = repo.commit(message, opts['user'], opts['date'],
- editor=cmdutil.getcommiteditor(edit=editopt))
+ editor = cmdutil.getcommiteditor(edit=editopt, editform='fetch')
+ n = repo.commit(message, opts['user'], opts['date'], editor=editor)
ui.status(_('new changeset %d:%s merges remote changes '
'with local\n') % (repo.changelog.rev(n),
short(n)))