mergetools / gvimdiff2on commit mergetool: accept -g/--[no-]gui as arguments (063f2bd)
   1. "$MERGE_TOOLS_DIR/vimdiff"