mergetools / gvimdiff2on commit Merge branch 'gj/push-more-verbose-advice' (289ca27)
   1. "$MERGE_TOOLS_DIR/vimdiff"