github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-01-19 23:12:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

hg completion: add :forcedump and :tagmerge merge tools

Browse Source
This commit is contained in:
Anton Shestakov 2018-08-16 19:25:16 +08:00
parent d70cdb19c1
commit b3a00c5389
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/completions/hg.fish
View File

@ -311,7 +311,7 @@ function __fish_hg_branches
end end
function __fish_hg_merge_tools 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" printf "$tool\tmerge tool\n"
end end
for line in (__fish_hg config merge-tools) for line in (__fish_hg config merge-tools)