Directorio actual://lib/git-core/mergetoolsArchivos:ecmergedeltawalkernvimdiffdiffmergearaxistkdiffkdiff3examdiffbcvimdiff.opendiffxxdiffgvimdiffmeldtortoisemergesmerge..p4mergeguiffyemergewinmergediffusecodecomparekompare