mergetools / gvimdiff2on commit Merge branch 'rs/merge-microcleanup' (e2a2a1d)
   1. "$MERGE_TOOLS_DIR/vimdiff"