mergetools / gvimdiff3on commit Merge branch 'js/larger-timestamps' (1392c5d)
   1. "$MERGE_TOOLS_DIR/vimdiff"