don't conflict when nothing changed, fix #642
fix typo
add test
fix test and add another one
fix test
fix fixture
Extract conditions into local function

Using a function with a meaningful name makes the
check more readable.
Merge pull request #649 from remotestorage/bug/641-dont_conflict_when_nothing_changed

don't conflict when nothing changed, fix #641