DESCRIPTION

Open mergetool by default in staging view when in conflicting state

Bug: 457055
Change-Id: I8299a9fff62147923d2300a1b4303ff5cb5a1c5e
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2015-01-27 23:50:13.000000000

Uploaded patch set 1.

-------------------------------------
author: Brenden Conley
date: 2015-01-27 23:50:18.000000000

Patch Set 1:

Build Started https://hudson.eclipse.org/egit/job/egit-stable.gerrit/523/

-------------------------------------
author: Brenden Conley
date: 2015-01-27 23:50:22.000000000

Patch Set 1: Verified-1

Build Failed 

https://hudson.eclipse.org/egit/job/egit-stable.gerrit/523/ : FAILURE

-------------------------------------
author: Brenden Conley
date: 2015-01-28 07:57:01.000000000

Patch Set 1: -Verified

Build Started https://hudson.eclipse.org/egit/job/egit-stable.gerrit/526/

-------------------------------------
author: Brenden Conley
date: 2015-01-28 08:12:03.000000000

Patch Set 1: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit-stable.gerrit/526/ : temporary update site https://hudson.eclipse.org/egit/job/egit-stable.gerrit/${BUILD_NUMBER}/artifact/org.eclipse.egit.repository/target/repository/

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