Sync markedlines stuff with TortoiseMerge