mergetools / gvimdiff3on commit git-rebase: don't ignore unexpected command line arguments (697bc88)
   1. "$MERGE_TOOLS_DIR/vimdiff"