From: Daniel Barkalow <barkalow@iabervon.org>
Date: Mon, 10 Dec 2007 03:05:34 +0000 (-0500)
Subject: Add more checkout tests
X-Git-Tag: v1.5.4-rc0~25
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c07c7bf630efd8ddcd41490036c1eefb01a39f98?hp=c07c7bf630efd8ddcd41490036c1eefb01a39f98

Add more checkout tests

If you have local changes that don't conflict with the
branch-switching changes, these should be kept, not cause errors even
without -m, and be reported afterwards in name-status format.

With -m, the changes carried across should be listed as well. And, for
now, include the merge-recursive output from this process.

Also test the detatched head message in at least one case.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---