Code

git-gui: Make Ctrl-T safe to use for conflicting files.
authorAlexander Gavrilov <angavrilov@gmail.com>
Tue, 30 Sep 2008 08:12:16 +0000 (12:12 +0400)
committerShawn O. Pearce <spearce@spearce.org>
Tue, 30 Sep 2008 18:47:33 +0000 (11:47 -0700)
commit0aea2842d9d556afa4a3e8120e465479ad7368ca
tree1e0a0bfa8bb6897e45e5b9a30fc10ce8b3d19a75
parentd3bcf55d675a255c00d2743c00978e1f42c93572
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>
git-gui.sh
lib/index.tcl
lib/merge.tcl
lib/mergetool.tcl