Meld merge 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,

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.

Meld is a visual diff and merge tool targeted at developers. Meld helps you compare files, directories, and version controlled projects. It provides two- and three-way comparison of both files and directories, and has support for many popular version control systems. Meld helps you review code changes and understand patches. It might even help you to figure out what is going on in that merge you keep avoiding.FeaturesFile comparisonEdit files in-place, and your comparison updates on-the-flyPerform two- and three-way diffs and mergesEasily navigate between differences and conflictsVisualise global and local differences with insertions, changes and conflicts markedUse the built-in regex text filtering to ignore uninteresting differencesSyntax highlightingDirectory comparisonCompare two or three directories file-by-file, showing new, missing, and altered filesDirectly open file comparisons of any conflicting or differing filesFilter out files or directories to avoid seeing spurious differencesSimple file management is also availableVersion controlMeld supports many version control systems, including Git, Mercurial, Bazaar and SVNLaunch file comparisons to check what changes were made, before you commitView file versioning statusesSimple version control actions are also available (i.e., commit/update/add/remove/delete files)Merge mode (in development)Automatically merge two files using a common ancestorMark and display the base version of all conflicting changes in the middle paneVisualise and merge independent modifications of the same fileLock down read-only merge bases to avoid mistakesCommand line interface for easy integration with existing tools, including git mergetoolRequirementsPython 2.7 (Python 3 not yet supported)GTK+ 3.12 (3.14 in development)GLib 2.36PyGObject 3.8 (3.14 in development)GtkSourceView 3.10 (3.14 in development)Meld - Visual Diff And Merge Tool Targeted At Developers Reviewed by Zion3R on 7:30 PM Rating: 5