git-gui: Allow git-merge to use branch names in conflict markers

[git.git] / lib / checkout_op.tcl

diff --git a/lib/checkout_op.tcl b/lib/checkout_op.tcl
index 40cc73a527374124be6539f0bfe81ddc54a1f227..170f737f611b48fa901e1789ec6d4f4d64834537 100644 (file)
--- a/lib/checkout_op.tcl
+++ b/lib/checkout_op.tcl
@@ -248,7 +248,7 @@ method _checkout {} {
        if {[lock_index checkout_op]} {
                after idle [cb _start_checkout]
        } else {
-               _error $this "Index is already locked."
+               _error $this "Staging area (index) is already locked."
                delete_this
        }
 }