| commit | 60468d6c893a6ad8795869d979a601e47cb90732 | |
| author | Pat Thoyts <patthoyts@users.sourceforge.net> | |
| Fri, 22 Feb 2013 20:13:21 +0000 (22 20:13 +0000) | ||
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | |
| Fri, 22 Feb 2013 20:13:21 +0000 (22 20:13 +0000) | ||
| tree | 0ad0984e974d181dae5aab54749c062f52b751b5 | treesnapshot (tar.gz zip) |
| parent | 9f316463ba00576d6c848bf50194b72246e8f9ab | commitdiff |
git-gui: fix the mergetool launcher for the Beyond Compare tool.
When using Beyond Compare as the mergetool it fails to save the merged
result correctly due to a quoting problem when executing the tool.
This patch solves the quoting problem.
Signed-off-by: Warren Falk <warren@warrenfalk.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
When using Beyond Compare as the mergetool it fails to save the merged
result correctly due to a quoting problem when executing the tool.
This patch solves the quoting problem.
Signed-off-by: Warren Falk <warren@warrenfalk.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| lib/mergetool.tcl | diffblobblamehistory |