diff options
| author |  Matthieu Moy <Matthieu.Moy@imag.fr> | 2009-02-19 13:54:18 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-02-19 23:22:57 -0800 |
| commit | e43a6fd3e94888d76779ad79fb568ed180e5fcdf (patch) | |
| tree | 10ebfaf701f9a4b8a0f9f72db9a33bda4c461653 /git-merge-resolve.sh | |
| parent | Document git blame --reverse. (diff) | |
| download | tgif-e43a6fd3e94888d76779ad79fb568ed180e5fcdf.tar.xz | |
More friendly message when locking the index fails.
Just saying that index.lock exists doesn't tell the user _what_ to do
to fix the problem. We should give an indication that it's normally
safe to delete index.lock after making sure git isn't running here.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions