Three way diff editor
Two way diff editor
Local modified Content
Base Content
Content that is changed after last pull/push in local
Content that is synced during last pull/push
Remote Content
Content that is changed after last pull/push in remote
submit
cancel