DESCRIPTION

Improve error reporting for pull failures due to conflicts

Change-Id: I9d64db17f2924ac2726aeedc83e55e9fdf653e15


COMMENTS

author: Juliet Cantu
date: 2013-03-24 12:09:56.000000000

Uploaded patch set 2.

-------------------------------------
author: Brenden Conley
date: 2013-03-24 12:10:02.000000000

Patch Set 2:

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

-------------------------------------
author: Brenden Conley
date: 2013-03-24 12:25:02.000000000

Patch Set 2: Verified

Build Successful 

https://hudson.eclipse.org/sandbox/job/egit.gerrit/4327/ : SUCCESS

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