[PATCH] Be more like the 'resolve' strategy.
authorFredrik Kuivinen <freku045@student.liu.se>
Tue, 13 Sep 2005 21:39:34 +0000 (23:39 +0200)
committerJunio C Hamano <junkio@cox.net>
Tue, 13 Sep 2005 22:45:23 +0000 (15:45 -0700)
commitd9a23fa...f7124befe7803f5f3a8c53999578caa4
tree6c8855b...9470b0d36c409d89772d1c0f55878191copy hash to clipboard (tree)
parentccfd3e9...621f489db4ea37a03be7674adbd03f6ecopy hash to clipboard (diff)
git-merge-recursive.py