cours-git/img/merge.dia