mergetools / gvimdiffon commit Merge branch 'jk/pull-rebase-using-fork-point' (d8cf714)
   1. "$MERGE_TOOLS_DIR/vimdiff"