Git mergetool completion #3226

merged 2 commits into from Jul 15, 2016


None yet

3 participants


auto complete "git mergetool" (optionally with --tool= and unmerged files)

@faho faho and 1 other commented on an outdated diff Jul 14, 2016
@@ -433,6 +433,31 @@ complete -f -c git -n '__fish_git_using_command merge' -l abort -d 'Abort the cu
# TODO options
+### mergetool
+function __fish_git_mergetools
+ set -l tools diffuse diffmerge ecmerge emerge kdiff3 meld opendiff tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc codecompare
+ for tool in $tools
+ command --search $tool >/dev/null; and begin
faho Jul 14, 2016 Member

Since you are doing begin/end anyway, this would be nicer with if command.

gladhorn Jul 15, 2016 Contributor

Thanks, I agree :)

gladhorn added some commits Jul 13, 2016
@gladhorn gladhorn git completion: add mergetool
The list of tools is stole from the bash completion file that comes with
@gladhorn gladhorn git completion: complete files with merget conflict for mergetool 7950066
@faho faho merged commit 6b99af0 into fish-shell:master Jul 15, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
faho commented Jul 15, 2016

Merged, thanks!

@faho faho added this to the next-2.x milestone Jul 15, 2016
@krader1961 krader1961 modified the milestone: fish 2.4.0, next-2.x Sep 3, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment