DESCRIPTION

Improve error reporting for pull failures due to conflicts

Change-Id: I9d64db17f2924ac2726aeedc83e55e9fdf653e15
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2013-03-25 02:26:08.000000000

Uploaded patch set 3.

-------------------------------------
author: Brenden Conley
date: 2013-03-25 02:26:14.000000000

Patch Set 3:

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

-------------------------------------
author: Douglas Trujillo
date: 2013-03-25 02:26:54.000000000

Patch Set 3: Verified; Looks good to me, approved; IP review completed

rebased

-------------------------------------
author: Douglas Trujillo
date: 2013-03-25 02:26:55.000000000

Change has been successfully merged into the git repository.

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