summaryrefslogtreecommitdiff
path: root/gitMergeCommon.py
diff options
context:
space:
mode:
authorFredrik Kuivinen <freku045@student.liu.se>2006-02-02 11:43:20 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-02 20:30:51 (GMT)
commit008bb6ea695e14740bfd14bec805cde6219b336e (patch)
tree8f3f765a55cd88bf7cd34158daca1e67220690ae /gitMergeCommon.py
parent985cb9cc5851ae2f65acf74a8db5077b69cc2a9b (diff)
downloadgit-008bb6ea695e14740bfd14bec805cde6219b336e.zip
git-008bb6ea695e14740bfd14bec805cde6219b336e.tar.gz
git-008bb6ea695e14740bfd14bec805cde6219b336e.tar.bz2
merge-recursive: Make use of provided bases
This makes some cases faster as we don't have to build the commit graph. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'gitMergeCommon.py')
0 files changed, 0 insertions, 0 deletions