From b3a00c5389d71520ced468e3d6b630f127890697 Mon Sep 17 00:00:00 2001 From: Anton Shestakov Date: Thu, 16 Aug 2018 19:25:16 +0800 Subject: [PATCH] hg completion: add :forcedump and :tagmerge merge tools --- share/completions/hg.fish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/completions/hg.fish b/share/completions/hg.fish index cdbc0ef64..6227aa8f5 100644 --- a/share/completions/hg.fish +++ b/share/completions/hg.fish @@ -311,7 +311,7 @@ function __fish_hg_branches end function __fish_hg_merge_tools - for tool in internal:dump internal:fail internal:local internal:merge internal:merge-local internal:merge-other internal:merge3 internal:other internal:prompt internal:union + for tool in internal:dump internal:fail internal:forcedump internal:local internal:merge internal:merge-local internal:merge-other internal:merge3 internal:other internal:prompt internal:tagmerge internal:union printf "$tool\tmerge tool\n" end for line in (__fish_hg config merge-tools)