merge-recursive: add a label for ancestor
authorJonathan Nieder <jrnieder@gmail.com>
Sun, 21 Mar 2010 00:52:21 +0000 (19:52 -0500)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Mar 2010 03:36:11 +0000 (20:36 -0700)
commit7ca56aa...7619b0345b643e52ae8e616cbaafc187
tree4fb8478...c1d1fa36e68c53206cce84b23e7b1318copy hash to clipboard (tree)
parentbf975d3...9d79ab0eb9e8835af4abab4712e71dadcopy hash to clipboard (diff)
merge-recursive.c