aboutsummaryrefslogtreecommitdiff
path: root/lib/index.tcl
diff options
context:
space:
mode:
authorAlexander Gavrilov <angavrilov@gmail.com>2008-08-31 00:54:19 +0400
committerShawn O. Pearce <spearce@spearce.org>2008-09-04 21:28:55 -0700
commit617ceee653bd7377f662bfc6d3085f321efab7e4 (patch)
treea24b3050c26321f93bacc8493b8e1c3757cf53d4 /lib/index.tcl
parent7e30682ce042fdea1ff2c76226b17d9affe2f9bf (diff)
downloadgit-617ceee653bd7377f662bfc6d3085f321efab7e4.tar.gz
git-617ceee653bd7377f662bfc6d3085f321efab7e4.tar.xz
git-gui: Don't allow staging files with conflicts.
Prevent staging files with conflict markers by clicking on the icon in the 'Unstaged Changes' list. Instead, pretend that the user clicked the name, and show the diff. Originally it made some sense to allow staging conflicting files, because git-gui did not provide any tools to resolve them from within the GUI. But now that we have added mergetool capabilities, it is more likely to cause accidental and non-undoable errors. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'lib/index.tcl')
0 files changed, 0 insertions, 0 deletions