Moved config_diff_merge_tool to be its own function
Move all fish functions to live in ~/.config/fish/functions/