| commit | 04c9e11f2cffaf84dd20602f811bf377f6033cb6 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 23 Feb 2008 23:45:19 +0000 (23 15:45 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 24 Feb 2008 08:36:31 +0000 (24 00:36 -0800) | ||
| tree | d208cc09f78b3467718c499fca7b50c03b0c9f87 | treesnapshot (tar.gz zip) |
| parent | 52229a29c78df2e48de23ed70ab1934667971d3c | commitdiff |
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>
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>
| builtin-checkout.c | diffblobblamehistory |