mergetools / gvimdiff2on commit Merge branch 'nd/untracked-cache' (38ccaf9)
   1. "$MERGE_TOOLS_DIR/vimdiff"