mergetools / gvimdiff3on commit Merge branch 'rs/patch-id-use-skip-prefix' (29e54b0)
   1. "$MERGE_TOOLS_DIR/vimdiff"