Try to find the optimum merge base while resolving.
authorJunio C Hamano <junkio@cox.net>
Wed, 24 Aug 2005 04:08:59 +0000 (21:08 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 24 Aug 2005 04:08:59 +0000 (21:08 -0700)
commit9585e40...224b97b24b46131005b809a6612a3eac
tree47b47d3...ae26e51f2b1d04fd9e898f5a0546da02copy hash to clipboard (tree)
parent2a29da7...6d6103c4719c71f6cce88e853260912ccopy hash to clipboard (diff)
git-resolve-script
merge-base.c