From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Jan 2011 17:11:30 GMT
Subject: Re: [ANNOUNCE] Git 1.7.4-rc1
Message-ID: <7v1v4k7kfx.fsf@alter.siamese.dyndns.org>
In-Reply-To: <201101100221.34077.johan@herland.net>

Johan Herland <johan@herland.net> writes:

> I can't find "git merge --abort" and "git notes merge" in this list. 
> Suggested paragraphs:
>
>  * "git merge" learned "--abort" option, synonymous to
>    "git reset --merge" when a merge is in progress.
>
>  * "git notes" learned the "merge" subcommand to merge notes refs.
>    In addition to the default manual conflict resolution, there are
>    also several notes merge strategies for automatically resolving
>    notes merge conflicts.

Thanks.