mergetools / gvimdiff3on commit Merge branch 'bw/commit-partial-from-subdirectory-fix' (8295f20)
   1. "$MERGE_TOOLS_DIR/vimdiff"