3-way merge with diff-match-patch

3way_merge.py

import os, glob
import diff_match_patch as dmp_module

dmp = dmp_module.diff_match_patch()

stashed = False

for file in glob.glob('textes_des_reglements/**/*.md'):
    # (FR) commit à partir duquel les corrections ont été manuelles
    # (EN) commit where started the manual corrections
    os.system('git checkout c548aae')
    with open(file) as f:
        v0 = f.read()

    # (FR) commit à partir duquel les correction manuelles auraient dut demarrer
    # (EN) commit where the manual corrections should have started
    os.system('git checkout correction-premier')
    with open(file) as f:
        v1 = f.read()

    os.system('git checkout master')
    with open(file) as f:
        v2 = f.read()

    patches = dmp.patch_make(v0, v2)
    (v3, Result) = dmp.patch_apply(patches, v1)

    # la version corrigée est gardée dans git stash le temps du script
    if stashed:
        os.system('git stash pop')

    open(file, 'w').write(v3)

    os.system('git stash')
    stashed = True

os.system('git stash pop')