From: John Tapsell <johnflux@gmail.com>
Date: Thu, 28 May 2009 16:12:40 GMT
Subject: Re: [PATCH] refuse to merge during a merge
Message-ID: <43d8ce650905280912q71c749bn7146210a5838a453@mail.gmail.com>
In-Reply-To: <20090527210410.GA14742@localhost>

> +       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