mergetools / gvimdiff2on commit Merge branch 'bb/date-iso-strict' (ceeacc5)
   1. "$MERGE_TOOLS_DIR/vimdiff"