Re: AW: Re*: AW: Getting the full path of a conflicting file within a custom merge driver?

2015-06-05 Thread Junio C Hamano
Gondek, Andreas andreas.gon...@dwpbank.de writes: One last question. If I don't want to compile Git myself, how long may the pu branch take approx. to get into a next release? There is no general estimate; not all topics necessarily graduate to the released version. I'd leave it on the list

AW: Re*: AW: Getting the full path of a conflicting file within a custom merge driver?

2015-06-04 Thread Gondek, Andreas
of a conflicting file within a custom merge driver? Junio C Hamano gits...@pobox.com writes: Gondek, Andreas andreas.gon...@dwpbank.de writes: thank you for responding this fast. I would suggest providing this information as an additional parameter (like %A %O %B and %L) maybe %P. Yes, per