mergetools / vimdiff3on commit log,diff-tree: add --combined-all-paths option (d76ce4f)
   1. "$MERGE_TOOLS_DIR/vimdiff"