Titre : Structure Aware Version Control 

Auteur : Victor Cacciari Miraldo (University of Utrecht)

Abstract : 

Modern version control systems are largely based on the UNIX
diff3 program for merging line-based edits on a given
file. Unfortunately, this bias towards line-based edits does not
work well for all file formats, which may lead to unnecessary conflicts.
This talk addresses the progress we made and problems we found 
towards a more expressive patch model, that exploits a file's structure
for more precise diff and merge algorithms.
Our ideas have been implemented in Agda and can be transcribed to
Haskell for an efficient implementation.