From 0559ad462defe84672bad1303418a423bbd73dc9 Mon Sep 17 00:00:00 2001
From: Eric Wong <eric@wsdjeg.net>
Date: Mon, 4 Mar 2024 20:19:11 +0800
Subject: [PATCH] feat(git): compete merge options

---
 bundle/git.vim/autoload/git/merge.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bundle/git.vim/autoload/git/merge.vim b/bundle/git.vim/autoload/git/merge.vim
index b9a39144b..43d08b924 100644
--- a/bundle/git.vim/autoload/git/merge.vim
+++ b/bundle/git.vim/autoload/git/merge.vim
@@ -102,8 +102,9 @@ endfunction
 
 function! s:args_with_two() abort
     return join([
-                \ '--stat',
+                \ '--stat', '--summary', '--log', '--commit', '--cleanup', '--abort', '--continue',
                 \ '--edit',
+                \ '--squash',
                 \ '--ff',
                 \ '--ff-only',
                 \ '--abort',
@@ -113,6 +114,7 @@ endfunction
 function! s:args_with_one() abort
     return join([
                 \ '-m',
+                \ '-F',
                 \ '-e',
                 \ ], "\n")