diff options
| author | Alexandre Julliard <julliard@winehq.org> | 2007-07-24 10:02:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-25 07:06:38 (GMT) |
| commit | ceefa44fe2d72f73548c4c36b42916b9c60ae16b (patch) | |
| tree | 9d8c7a481fcbd271a378db23c1cb711126432916 /builtin-mv.c | |
| parent | 1c911dc86cd8c504fbad98a75b28cbc92317a0e8 (diff) | |
| download | git-ceefa44fe2d72f73548c4c36b42916b9c60ae16b.zip git-ceefa44fe2d72f73548c4c36b42916b9c60ae16b.tar.gz git-ceefa44fe2d72f73548c4c36b42916b9c60ae16b.tar.bz2 | |
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>
Diffstat (limited to 'builtin-mv.c')
0 files changed, 0 insertions, 0 deletions