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
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2012-02-26 00:45:03.000000000

Uploaded patch set 3.

-------------------------------------
author: Brenden Conley
date: 2012-02-26 00:45:07.000000000

Patch Set 3:

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

-------------------------------------
author: Douglas Trujillo
date: 2012-02-26 00:45:36.000000000

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

rebased

-------------------------------------
author: Douglas Trujillo
date: 2012-02-26 00:45:38.000000000

Change has been successfully merged into the git repository.

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