also sprach Junio C Hamano <gitster@xxxxxxxxx> [2007.10.02.2055 +0100]: > Perhaps you can use the existing union merge there. Many thanks for the pointer, I did not even have time to look at gitattributes.txt yet... -- martin; (greetings from the heart of the sun.) \____ echo mailto: !#^."<*>"|tr "<*> mailto:"; net@madduck "self-denial is the shining sore on the leprous body of christianity." -- oscar wilde spamtraps: madduck.bogus@xxxxxxxxxxx
Attachment:
digital_signature_gpg.asc
Description: Digital signature (see http://martin-krafft.net/gpg/)
