Since we return current the check should be >= 0
Since there is no conflict, (A2) should win (?)
Merge https://github.com/binwiederhier/syncany
Merge branch 'master' into quick-fix