[merge] new allowEditingOriginals option to edit all compared files

![merge_both_ways](https://cloud.githubusercontent.com/assets/476495/3719859/ee228bb8-164a-11e4-91df-19a6d6f97b12.png)