git.el: Pass an explicit argument to enable smerge-mode.
authorAlexandre Julliard <julliard@winehq.org>
Tue, 24 Jul 2007 10:02:28 +0000 (12:02 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jul 2007 07:06:38 +0000 (00:06 -0700)
commitceefa44fe2d72f73548c4c36b42916b9c60ae16b
tree9d8c7a481fcbd271a378db23c1cb711126432916
parent1c911dc86cd8c504fbad98a75b28cbc92317a0e8
git.el: Pass an explicit argument to enable smerge-mode.

Without argument the mode is toggled, which would do the wrong thing
if the file was already open.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/emacs/git.el