user/sven/git.git/git-mergetool.sh, branch v1.5.6.4

mergetool: Make ECMerge use the settings as specified by the user in the GUI

2008-05-11T17:12:19Z

When run from the command line, ECMerge does not automatically use the same settings for a merge / diff that it would use when starting the GUI and loading files manually. In the first case the built-in factory defaults would be used, while in the second case the settings the user has specified in the GUI would be used, which can be misleading. Specifying the "--default" command line option changes this behavior so that always the user specfified GUI settings are used. Signed-off-by: Sebastian Schuberth Tested-by: Steffen Prohaska Signed-off-by: Junio C Hamano

Teach git mergetool to use custom commands defined at config time

2008-03-05T20:07:04Z

Currently git mergetool is restricted to a set of commands defined in the script. You can subvert the mergetool..path to force git mergetool to use a different command, but if you have a command whose invocation syntax does not match one of the current tools then you would have to write a wrapper script for it. This patch adds two git config variable patterns which allow a more flexible choice of merge tool. If you run git mergetool with -t/--tool or the merge.tool config variable set to an unrecognized tool then git mergetool will query the mergetool..cmd config variable. If this variable exists, then git mergetool will treat the specified tool as a custom command and will use a shell eval to run the command with the documented shell variables set. mergetool..trustExitCode can be used to indicate that the exit code of the custom command can be used to determine the success of the merge. Signed-off-by: Charles Bailey Signed-off-by: Junio C Hamano

Changed an internal variable of mergetool to support custom commands

2008-03-05T20:07:03Z

The variable $path changes to $MERGED so that it is more consistent with $BASE, $LOCAL and $REMOTE for future custom command lines. Signed-off-by: Charles Bailey Signed-off-by: Junio C Hamano

Tidy up git mergetool's backup file behaviour

2008-03-05T20:07:03Z

Currently a backup pre-merge file with conflict markers is sometimes kept with a .orig extenstion and sometimes removed depending on the particular merge tool used. This patch makes the handling consistent across all merge tools and configurable via a new mergetool.keepBackup config variable Signed-off-by: Charles Bailey Signed-off-by: Junio C Hamano

Allow git-mergetool to handle paths with a leading space

2008-01-08T05:00:54Z

Signed-off-by: Rogan Dawes

Open external merge tool with original file extensions for all three files

2007-12-06T02:43:20Z

Before this change, conflicted files were open in external merge tool with temporary filenames like REMOTE.$$ and LOCAL.$$. This way meld was unable to recognize these files and syntax highlighting feature was unusable. Help such merge tools by giving temporar files the same extension as the original. Signed-off-by: Pini Reznik Signed-off-by: Junio C Hamano

scripts: Add placeholders for OPTIONS_SPEC

2007-11-06T09:50:02Z

--text follows this line-- These commands currently lack OPTIONS_SPEC; allow people to easily list with "git grep 'OPTIONS_SPEC=$'" what they can help improving. Signed-off-by: Junio C Hamano

mergetool: avoid misleading message "Resetting to default..."

2007-10-18T23:59:58Z

If no mergetool is configured in the configuration variable merge.tool the resetting message should not be printed. This is fixed. The message is only printed if a tool is configured but the entry in merge.tool is invalid. Signed-off-by: Steffen Prohaska Signed-off-by: Shawn O. Pearce

mergetool: add support for ECMerge

2007-10-18T07:46:24Z

Add support to mergetool for ECMerge available from http://www.elliecomputing.com/Products/merge_overview.asp Signed-off-by: Steffen Prohaska Signed-off-by: Shawn O. Pearce

mergetool: use path to mergetool in config var mergetool..path

2007-10-18T07:46:24Z

This commit adds a mechanism to provide absolute paths to the external programs called by 'git mergetool'. A path can be specified in the configuation variable mergetool..path. The configuration variable is similar to how we name branches and remotes. It is extensible if we need to specify more details about a tool. The mechanism is especially useful on Windows, where external programs are unlikely to be in PATH. [sp: Fixed a few minor issues prior to applying] Signed-off-by: Steffen Prohaska Signed-off-by: Shawn O. Pearce