DESCRIPTION

Correct grammatical error in unable to merge message

Change-Id: I4d719fc69599eae7f8f8fd9e88394fe8ae2208f1


COMMENTS

author: Brenden Conley
date: 2011-11-29 02:23:51.000000000

Patch Set 1:

Build Started https://hudson.eclipse.org/sandbox/job/egit.gerrit/2134/ 

-------------------------------------
author: Brenden Conley
date: 2011-11-29 02:27:01.000000000

Patch Set 1: Build Failed

Build Failed 
 
https://hudson.eclipse.org/sandbox/job/egit.gerrit/2134/ : FAILURE

-------------------------------------
author: Douglas Trujillo
date: 2011-11-29 14:48:04.000000000

Patch Set 1: Looks good to me, approved; Build Successful; IP review completed



-------------------------------------
author: Gerrit Johnathan Pham
date: 2011-11-29 14:48:05.000000000

Your change could not be merged due to a path conflict.

Please merge (or rebase) the change locally and upload the resolution for review.

-------------------------------------
