summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLibravatar Shawn O. Pearce <spearce@spearce.org>2007-08-02 22:55:22 -0400
committerLibravatar Shawn O. Pearce <spearce@spearce.org>2007-08-02 22:55:22 -0400
commita13ee29b975d3a9a012983309e842d942b2bbd44 (patch)
tree6c4aa2018e61336541a2af4a4bca7eecc7896306 /Documentation/git-merge-index.txt
parentgit-gui: Minor refactoring of merge command line in merge support (diff)
downloadtgif-a13ee29b975d3a9a012983309e842d942b2bbd44.tar.xz
git-gui: Avoid Tcl error in popup menu on diff viewer
If there is no path currently shown in the diff viewer then we were getting Tcl errors anytime the user right-clicked on the diff viewer to bring up its popup menu. The bug here is caused by trying to get the file_state for the empty string; this path is never seen so we never have file_state for it. In such cases we now disable the Stage Hunk For Commit option. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions