Problems when conflicts occur

Hello PushOk-team,

This file is definitly not created by svn. I first have seen it, after I
began using your plugin. And I had conflicts before this already.

The other two issues are pretty easy to reproduce:
1) The additional linebreak gets added with every occuring conflict.
2) Just make sure, your conflict is in the very last line.

Just have a look at when you create the rep.conflict-file, because it
already has these errors in it.

Kind regards,
Daniel Hilgarth
pi-consult gmbh

Hello PushOk-team,

it already has been a week again since I posted this.
It shouldn't be too hard to provide at least SOME feedback, e.g. whether
you could verify the errors or not.
I purchased a professional tool that sometimes doesn't work as it should.
That's not a big deal, after all it is software.
But then I insist on professional support, because I paid for it.

Best regards,
Daniel Hilgarth
pi-consult gmbh

Hello PushOk-team,

- A temporary file .#.rep.conflict.filename.ext is created and never
deleted.
- To the end of a conflicted file an additional linebreak is appended
everytime a conflict occurs.
- If the conflict is in the last line of the file, this line is replaced by
an empty line. In this case, the conflict editor is not launched and the
message "No real difference detected, skipping..." is shown in the output.

I use version 1.2.1_050822

Kind regards,
Daniel Hilgarth
pi-consult gmbh