DESCRIPTION

Add Commit... and Reset... buttons to conflict dialog

  * Move path options to dropdown menu at right of table
  * Removes repository text box
  * Minor wording changes to messages

Change-Id: Ia3e5e4c09b92219102e15b9578780c1095663c03


COMMENTS

author: Jaidyn Nichols
date: 2012-02-24 23:00:54.000000000

Uploaded patch set 2.

-------------------------------------
author: Brenden Conley
date: 2012-02-24 23:00:58.000000000

Patch Set 2:

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

-------------------------------------
author: Brenden Conley
date: 2012-02-24 23:18:07.000000000

Patch Set 2: Verified

Build Successful 
 
https://hudson.eclipse.org/sandbox/job/egit.gerrit/2516/ : SUCCESS

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