mergetools / gvimdiff3on commit Fix use of strategy options with interactive rebases (0060041)
   1. "$MERGE_TOOLS_DIR/vimdiff"