mergetools / gvimdiff3on commit Merge branch 'rs/wt-status-cleanup' (094aa09)
   1. "$MERGE_TOOLS_DIR/vimdiff"