From: Nanako Shiraishi <nanako3@lavabit.com>
Date: Sat, 12 Dec 2009 09:19:25 GMT
Subject: Re: [PATCH 2/3] commit/status: "git add <path>" is not necessarily how to resolve
Message-ID: <20091212181925.6117@nanako3.lavabit.com>
In-Reply-To: <1260608523-15579-3-git-send-email-gitster@pobox.com>

Quoting Junio C Hamano <gitster@pobox.com>

>  # On branch side
>  # Unmerged paths:
>  #   (use "git reset HEAD <file>..." to unstage)
> -#   (use "git add <file>..." to mark resolution)
> +#   (use "git add/rm <file>..." as appropriately to mark resolution)

Shouldn't this either be "as appropriate" or just "appropriately"?

-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/