[aur-general] Merge fishfish-git to fish-shell-git