commit | ceefa44fe2d72f73548c4c36b42916b9c60ae16b | [log] [tgz] |
---|---|---|
author | Alexandre Julliard <julliard@winehq.org> | Tue Jul 24 12:02:28 2007 +0200 |
committer | Junio C Hamano <gitster@pobox.com> | Wed Jul 25 00:06:38 2007 -0700 |
tree | 9d8c7a481fcbd271a378db23c1cb711126432916 | |
parent | 1c911dc86cd8c504fbad98a75b28cbc92317a0e8 [diff] |
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>