xdl_merge(): add optional ancestor label to diff3-style output
authorJonathan Nieder <jrnieder@gmail.com>
Sun, 21 Mar 2010 00:31:44 +0000 (19:31 -0500)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Mar 2010 03:36:10 +0000 (20:36 -0700)
commit8a16143...a0b414d15093e312eb9be99587074309
treee346398...5c40f7aaad66efa4f9f4e07ff9790034copy hash to clipboard (tree)
parent6a84334...ab08e7c701ac2343ffbe2d11ecb7ebabcopy hash to clipboard (diff)
xdiff/xdiff.h
xdiff/xmerge.c