mergetools / gvimdiff2on commit Merge branch 'jk/getwholeline-getdelim-empty' (087f171)
   1. "$MERGE_TOOLS_DIR/vimdiff"