merge-recursive: Make use of provided bases
authorFredrik Kuivinen <freku045@student.liu.se>
Thu, 2 Feb 2006 11:43:20 +0000 (12:43 +0100)
committerJunio C Hamano <junkio@cox.net>
Thu, 2 Feb 2006 20:30:51 +0000 (12:30 -0800)
commit008bb6e...695e14740bfd14bec805cde6219b336e
tree8f3f765...55cd88bf7cd34158daca1e67220690aecopy hash to clipboard (tree)
parent985cb9c...5851ae2f65acf74a8db5077b69cc2a9bcopy hash to clipboard (diff)
git-merge-recursive.py