mergetools / gvimdiffon commit Merge branch 'ag/rebase-p' (f3fec40)
   1. "$MERGE_TOOLS_DIR/vimdiff"