diff options
| author |  Alexander Gavrilov <angavrilov@gmail.com> | 2008-09-30 12:12:16 +0400 |
|---|---|---|
| committer |  Shawn O. Pearce <spearce@spearce.org> | 2008-09-30 11:47:33 -0700 |
| commit | 0aea2842d9d556afa4a3e8120e465479ad7368ca (patch) | |
| tree | 1e0a0bfa8bb6897e45e5b9a30fc10ce8b3d19a75 /lib/merge.tcl | |
| parent | git-gui: Do not automatically stage file after merge tool finishes (diff) | |
| download | tgif-0aea2842d9d556afa4a3e8120e465479ad7368ca.tar.xz | |
git-gui: Make Ctrl-T safe to use for conflicting files.
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 <angavrilov@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'lib/merge.tcl')
| -rw-r--r-- | lib/merge.tcl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/merge.tcl b/lib/merge.tcl index 5c01875b05..ac4c7ded14 100644 --- a/lib/merge.tcl +++ b/lib/merge.tcl @@ -40,6 +40,7 @@ The rescan will be automatically started now. _O { continue; # and pray it works! } + _U U? { error_popup [mc "You are in the middle of a conflicted merge. |