From 9a2b0dc275f70ff737339b84123fe57324adc246 Mon Sep 17 00:00:00 2001
From: NextAlone <12210746+NextAlone@users.noreply.github.com>
Date: Mon, 25 Apr 2022 14:34:38 +0800
Subject: [PATCH] fix: wrong completion in git merge

---
 share/completions/git.fish | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index ecf635ca2..687e912e1 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1611,8 +1611,8 @@ complete -f -c git -n '__fish_git_using_command merge' -l progress -d 'Force pro
 complete -f -c git -n '__fish_git_using_command merge' -l no-progress -d 'Force no progress status'
 complete -f -c git -n '__fish_git_using_command merge' -l allow-unrelated-histories -d 'Allow merging even when branches do not share a common history'
 complete -x -c git -n '__fish_git_using_command merge' -s m -d 'Set the commit message'
-complete -f -c git -n '__fish_git_using_command merge' -s rerere-autoupdate -d 'If possible, use previous conflict resolutions'
-complete -f -c git -n '__fish_git_using_command merge' -s no-rerere-autoupdate -d 'Do not use previous conflict resolutions'
+complete -f -c git -n '__fish_git_using_command merge' -l rerere-autoupdate -d 'If possible, use previous conflict resolutions'
+complete -f -c git -n '__fish_git_using_command merge' -l no-rerere-autoupdate -d 'Do not use previous conflict resolutions'
 complete -f -c git -n '__fish_git_using_command merge' -l abort -d 'Abort the current conflict resolution process'
 complete -f -c git -n '__fish_git_using_command merge' -l continue -d 'Conclude current conflict resolution process'