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: Zachary Orozco
date: 2015-02-02 13:50:46.000000000

Uploaded patch set 2.

-------------------------------------
author: Brenden Conley
date: 2015-02-02 13:50:52.000000000

Patch Set 2:

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

-------------------------------------
author: Brenden Conley
date: 2015-02-02 14:06:30.000000000

Patch Set 2: Verified+1

Build Successful 

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

-------------------------------------
author: Zachary Orozco
date: 2015-02-02 15:51:24.000000000

Patch Set 2: Code-Review+2

-------------------------------------
author: Zachary Orozco
date: 2015-02-02 15:51:31.000000000

Change has been successfully merged into the git repository.

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