Am Donnerstag, 11. Februar 2010 schrieb Neels J Hofmeyr: > Hi Christoph, > > it would be nice if you could provide a way to reproduce this issue. I am > aware that this can be some work, and we would highly appreciate it. :)
Hi, here is the script. When it comes to choosing the merge operation I choose (p). The file dir_b/file has the wrong conflict markers. Christoph
merge_fail.sh
Description: application/shellscript
