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

