mergetools / gvimdiff3on commit filter-branch: resolve $commit^{tree} in no-index case (1dc413e)
   1. "$MERGE_TOOLS_DIR/vimdiff"