Re: Merge conflicts

there is not much special a generic client can do in the
"auto-merge-with-conflict", so I suggest you to set it for your case.

----------------
me <at> wslaat.com | ÇáÚÇÈ
http://stuff.wslaat.com/%D8%A7%D9%84%D8%B9%D8%A7%D8%A8-b11-1/