Johannes Sixt <j.sixt <at> viscovery.net> writes: > > I have my image merge script configured it like this: > > [merge "imgfile"] > driver = imgmerge %O %A %B %A > > but if you do that, you must be sure that the script does not need to > access $2 after it has begun writing to $4. > > (I know that it worked because at one time I had forgotten that I have a > custom merge driver, and was expecting a merge conflict due to an image > file, but there was no conflict, and the result was correct > Hi Johannes, Thanks a lot for your help. I have checked it and I'm writing to the right file after reading the data from it. According to what I see, only the modifications made on the current branch are saved, even after applying the delta to the right image file. One question is: does it matter if I save the whole file, replacing the old with this new one? Or do I need to open the old one and modify its content? Thanks again! -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html