user/sven/git.git/lib/mergetool.tcl, branch gitgui-0.18.0

git-gui: fix the mergetool launcher for the Beyond Compare tool.

2013-02-22T20:13:21Z

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 Signed-off-by: Pat Thoyts

mergetool--lib: Add Beyond Compare 3 as a tool

2011-02-27T08:47:34Z

Signed-off-by: Sebastian Schuberth Signed-off-by: Junio C Hamano

mergetool--lib: Sort tools alphabetically for easier lookup

2011-02-27T08:47:13Z

Signed-off-by: Sebastian Schuberth Signed-off-by: Junio C Hamano

git-gui: Ensure consistent usage of mergetool.keepBackup

2009-04-08T14:40:58Z

In several places merge.keepBackup is used i.s.o. mergetool.keepBackup. This patch makes it all consistent. Signed-off-by: Ferry Huberts Signed-off-by: Shawn O. Pearce

git-gui: Fix merge conflict display error when filename contains spaces

2009-03-20T21:44:28Z

When a merge conflict occurs in a file with spaces in the filename, git-gui showed wrongly "LOCAL: deleted". Signed-off-by: Jens Lehmann Signed-off-by: Shawn O. Pearce

git-gui: Make Ctrl-T safe to use for conflicting files.

2008-09-30T18:47:33Z

A previous patch added a check for conflict markers, which is done when the file is about to be staged due to a click on the icon. However, pressing Ctrl-T still immediately stages the file without confirmation. This patch fixes it. The check requires a loaded diff, so staging multiple files at once won't work if they are unmerged. Signed-off-by: Alexander Gavrilov Signed-off-by: Shawn O. Pearce

git-gui: Do not automatically stage file after merge tool finishes

2008-09-30T18:40:48Z

If a merge tool was invoked on a conflicted file and the tool completed, then the conflicted file was staged automatically. However, the fact that the user closed the merge tool cannot be understood as the unequivocal sign that the conflict was completely resolved. For example, the user could have decided to postpone the resolution of the conflict, or could have accidentally closed the tool. We better leave the file unstaged and let the user stage it explicitly. Signed-off-by: Johannes Sixt Signed-off-by: Shawn O. Pearce

git-gui: Reenable staging unmerged files by clicking the icon.

2008-09-24T19:51:43Z

This restores functionality of the file icon for unmerged files. Safety is enforced by loading the diff and checking for lines that look like conflict markers. If such lines are found, or the conflict involves deletion and/or symlinks, a confirmation dialog is presented. Otherwise, the icon immediately stages the working copy version of the file. Includes a revert of 2fe5b2ee42897a3acc78e5ddaace3775eb2713ca (Restore ability to Stage Working Copy for conflicts) Signed-off-by: Alexander Gavrilov Tested-by: Johannes Sixt Signed-off-by: Shawn O. Pearce

git-gui: I18n fix sentence parts into full sentences for translation again.

2008-09-12T15:38:42Z

For translations, it is almost always impossible to correctly translate parts of sentences in almost any other language. Hence, messages like this must be re-organized into full sentences. Signed-off-by: Christian Stimming Signed-off-by: Shawn O. Pearce

git-gui: Restore ability to Stage Working Copy for conflicts.

2008-09-12T15:09:09Z

Tools like rerere leave files marked as conflicts in the index, while actually resolving them in the working copy. Also, some people like to use an external editor to resolve conflicts. This patch restores functionality previously removed in commit 617ceee653 by adding a new context menu item. It still ensures that the user does not stage conflicting files accidentally by clicking on the icon instead of the name. Signed-off-by: Alexander Gavrilov Tested-by: Johannes Sixt Signed-off-by: Shawn O. Pearce