Improved submodule merge support
authorFinn Arne Gangstad <finnag@pvv.org>
Tue, 18 Dec 2007 19:50:28 +0000 (20:50 +0100)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Dec 2007 00:58:42 +0000 (16:58 -0800)
commit20b178d...7b20a0ebf02b8da3b4791c06fc8e3a63
tree7d36389...fe9d67392bc45bc8cf79bf54af057a46copy hash to clipboard (tree)
parent5909651...a2be69932d9b739b4441ca857ced7660copy hash to clipboard (diff)
merge-recursive.c