mergetools / gvimdiff3on commit Merge branch 'jc/apply-ws-prefix' (ead51a7)
   1. "$MERGE_TOOLS_DIR/vimdiff"