> + if (read_cache_unmerged() || file_exists(git_path("MERGE_HEAD")))
> die("You are in the middle of a conflicted merge.");
Could the error message also give possible solutions? "Commit the
current merge first with 'git commit', or discard the current merge
attempt with 'git reset --hard'" or something. Or at least a pointer
to where to read for more info.
John
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html