About Meld tool
To override the global mergetool.hideResolved valuefor a specific tool. See mergetool.hideResolved for the fulldescription. mergetool..trustExitCode For a custom merge command, specify whether the exit code ofthe merge command can be used to determine whether the merge wassuccessful. If this is not set to true then the merge target filetimestamp is checked and the merge assumed to have been successfulif the file has been updated, otherwise the user is prompted toindicate the success of the merge. mergetool.meld.hasOutput Older versions of meld do not support the --output option.Git will attempt to detect whether meld supports --outputby inspecting the output of meld --help. Configuringmergetool.meld.hasOutput will make Git skip these checks anduse the configured value instead. Setting mergetool.meld.hasOutputto true tells Git to unconditionally use the --output option,and false avoids using --output. mergetool.meld.useAutoMerge When the --auto-merge is given, meld will merge all non-conflictingparts automatically, highlight the conflicting parts and wait foruser decision. Setting mergetool.meld.useAutoMerge to true tellsGit to unconditionally use the --auto-merge option with meld.Setting this value to auto makes git detect whether --auto-mergeis supported and will only use --auto-merge when available. Avalue of false avoids using --auto-merge altogether, and is thedefault value. mergetool.hideResolved During a merge Git will automatically resolve as many conflicts aspossible and write the MERGED file containing conflict markers aroundany conflicts that it cannot resolve; LOCAL and REMOTE normallyrepresent the versions of the file from before Git’s conflictresolution. This flag causes LOCAL and REMOTE to be overwriten sothat only the unresolved conflicts are presented to the merge tool. Canbe configured per-tool via the mergetool..hideResolvedconfiguration variable. Defaults to false. mergetool.keepBackup After performing a merge, the original file with conflict markerscan be saved as a file with a .orig extension. If this variableis set to false then this file is not preserved. Defaults totrue (i.e. keep the backup files). mergetool.keepTemporaries When invoking a custom merge tool, Git uses a set of temporaryfiles to pass to the tool. If the tool returns an error and thisvariable is set to true, then these temporary files will bepreserved, otherwise they will be removed after the tool hasexited. Defaults to false. mergetool.writeToTemp Git writes temporary BASE, LOCAL,
Key features of the Meld tool that are enabled through these drivers include:
- Meld Visual diff and merge tool
- Important commands for the CLI tool meld
- Meld –Visual Diff Tool – Brian.Carnell.Com
- meld - Tooling Tuesday - Ben Nuttall
- Visual diff/merge tool - Meld
- The Meld Graphical Comparison Tool - LWN.net
- Meld: a useful diff tool - mbukowicz.github.io
Meld supports --outputby inspecting the output of meld --help. Configuringmergetool.meld.hasOutput will make Git skip these checks anduse the configured value instead. Setting mergetool.meld.hasOutputto true tells Git to unconditionally use the --output option,and false avoids using --output. mergetool.meld.useAutoMerge When the --auto-merge is given, meld will merge all non-conflictingparts automatically, highlight the conflicting parts and wait foruser decision. Setting mergetool.meld.useAutoMerge to true tellsGit to unconditionally use the --auto-merge option with meld.Setting this value to auto makes git detect whether --auto-mergeis supported and will only use --auto-merge when available. Avalue of false avoids using --auto-merge altogether, and is thedefault value. mergetool.hideResolved During a merge Git will automatically resolve as many conflicts aspossible and write the MERGED file containing conflict markers aroundany conflicts that it cannot resolve; LOCAL and REMOTE normallyrepresent the versions of the file from before Git’s conflictresolution. This flag causes LOCAL and REMOTE to be overwriten sothat only the unresolved conflicts are presented to the merge tool. Canbe configured per-tool via the mergetool..hideResolvedconfiguration variable. Defaults to false. mergetool.keepBackup After performing a merge, the original file with conflict markerscan be saved as a file with a .orig extension. If this variableis set to false then this file is not preserved. Defaults totrue (i.e. keep the backup files). mergetool.keepTemporaries When invoking a custom merge tool, Git uses a set of temporaryfiles to pass to the tool. If the tool returns an error and thisvariable is set to true, then these temporary files will bepreserved, otherwise they will be removed after the tool hasexited.
