mergetools / gvimdiff2on commit Merge branch 'js/rebase-deprecate-preserve-merges' (2656ece)
   1. "$MERGE_TOOLS_DIR/vimdiff"