diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-24 00:45:19 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-24 09:36:31 +0100 |
| commit | 04c9e11f2cffaf84dd20602f811bf377f6033cb6 (patch) | |
| tree | d208cc09f78b3467718c499fca7b50c03b0c9f87 /read-cache.c | |
| parent | checkout: show progress when checkout takes long time while switching branches (diff) | |
| download | git-04c9e11f2cffaf84dd20602f811bf377f6033cb6.tar.xz git-04c9e11f2cffaf84dd20602f811bf377f6033cb6.zip | |
checkout: error out when index is unmerged even with -m
Even when -m is given to allow fallilng back to 3-way merge
while switching branches, we should refuse if the original index
is unmerged.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Daniel Barkalow <barkalow@iabervon.org>
Diffstat (limited to 'read-cache.c')
0 files changed, 0 insertions, 0 deletions