git/mergetools, branch v1.8.2.2

Merge branch 'da/p4merge-mktemp-fix'

2013-02-15T00:05:56Z

* da/p4merge-mktemp-fix: p4merge: fix printf usage

p4merge: fix printf usage

2013-02-10T19:40:52Z

Do not use a random string as if it is a format string for printf when showing it literally; instead feed it to '%s' format. Reported-by: Asheesh Laroia Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

Merge branch 'ss/mergetools-tortoise'

2013-02-07T22:42:01Z

Update mergetools to work better with newer merge helper tortoise ships. * ss/mergetools-tortoise: mergetools: teach tortoisemerge to handle filenames with SP correctly mergetools: support TortoiseGitMerge

Merge branch 'jk/mergetool'

2013-02-07T22:41:57Z

Cleans up mergetool/difftool combo. * jk/mergetool: mergetools: simplify how we handle "vim" and "defaults" mergetool--lib: don't call "exit" in setup_tool mergetool--lib: improve show_tool_help() output mergetools/vim: remove redundant diff command git-difftool: use git-mergetool--lib for "--tool-help" git-mergetool: don't hardcode 'mergetool' in show_tool_help git-mergetool: remove redundant assignment git-mergetool: move show_tool_help to mergetool--lib

mergetools: teach tortoisemerge to handle filenames with SP correctly

2013-02-02T02:06:03Z

TortoiseGitMerge, unlike TortoiseMerge, can be told to handle paths with spaces in them by using -option "$FILE" (not -option:"$FILE", which does not work for such paths) syntax. This change was necessary because of MSYS path mangling [1], the ":" after the "base" etc. arguments to TortoiseMerge caused the whole argument instead of just the file name to be quoted in case of file names with spaces. So TortoiseMerge was passed "-base:new file.txt" instead of -base:"new file.txt" (including the quotes). To work around this, TortoiseGitMerge does not require the ":" after the arguments anymore which fixes handling file names with spaces [2] (as written above). [1] http://www.mingw.org/wiki/Posix_path_conversion [2] https://github.com/msysgit/msysgit/issues/57 Signed-off-by: Sven Strickroth Reported-by: Sebastian Schuberth Signed-off-by: Junio C Hamano

mergetools: simplify how we handle "vim" and "defaults"

2013-01-29T03:00:38Z

Remove the exceptions for "vim" and "defaults" in the mergetool library so that every filename in mergetools/ matches 1:1 with the name of a valid built-in tool. Define the trivial fallback definition of shell functions in-line in git-mergetool-lib script, instead of dot-sourcing them from another file. The result is much easier to follow. [jc: squashed in an update from John Keeping as well] Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

mergetools/vim: remove redundant diff command

2013-01-28T02:32:43Z

vimdiff and vimdiff2 differ only by their merge command so remove the logic in the diff command since it's not actually needed. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

mergetools: support TortoiseGitMerge

2013-01-27T03:01:46Z

TortoiseMerge.exe was ben renamed to TortoiseGitMerge.exe (starting with 1.8.0) in order to make it clear that it has special support for git, and prevent confusion with the TortoiseSVN TortoiseMerge version. Signed-off-by: Sven Strickroth Signed-off-by: Junio C Hamano

mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder

2012-12-27T02:13:15Z

Use $TMPDIR when creating the /dev/null placeholder for p4merge. This prevents users from finding a seemingly random untracked file in their worktree. This is different than what mergetool does with $LOCAL and $REMOTE because those files exist to aid users when resolving merges. p4merge's /dev/null placeholder is not helpful in that situation so it is sensible to keep it out of the worktree. Reported-by: Jeremy Morton Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

Merge branch 'da/mergetools-p4'

2012-10-25T10:42:57Z

* da/mergetools-p4: mergetools/p4merge: Handle "/dev/null"