merge-trees: push choice to renormalize away from low level
authorJonathan Nieder <jrnieder@gmail.com>
Thu, 5 Aug 2010 11:13:49 +0000 (06:13 -0500)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Aug 2010 16:20:00 +0000 (09:20 -0700)
commit3e7589b...b3ff7a7aa93bec39c40603e370c51317
tree4df3a20...9810c1e43f939a12c593bd0635084fa8copy hash to clipboard (tree)
parentbeeeb45...93332f38de2a3b58120c5bebb5863577copy hash to clipboard (diff)
merge-recursive.c