fixes #321: Word diff highlighting breaks for swapped phrases
Merge pull request #325 from muhqu/gitx-dev-issue/321

fixes #321: Word diff highlighting breaks for swapped phrases