DESCRIPTION

Improve error reporting for pull failures due to conflicts

Change-Id: I9d64db17f2924ac2726aeedc83e55e9fdf653e15


COMMENTS

author: Brenden Conley
date: 2013-03-17 17:30:12.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2013-03-17 17:44:57.000000000

Patch Set 1: Verified

Build Successful 

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

-------------------------------------
author: Danika Greer
date: 2013-03-20 23:54:08.000000000

Patch Set 1: (1 inline comment)



Line:154, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullResultDialog.java -> This message is no longer used, should be removed.

-------------------------------------
author: Juliet Cantu
date: 2013-03-24 12:10:14.000000000

Patch Set 1: (1 inline comment)



Line:154, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullResultDialog.java -> Done

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