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-09 00:48:21.000000000

Uploaded patch set 1.

-------------------------------------
author: Brenden Conley
date: 2015-01-09 00:48:28.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2015-01-09 01:05:51.000000000

Patch Set 1: Code-Review-1

Build Unstable 

https://hudson.eclipse.org/egit/job/egit.gerrit/6601/ : UNSTABLE

-------------------------------------
author: Brenden Conley
date: 2015-01-09 06:59:00.000000000

Patch Set 1: -Code-Review

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

-------------------------------------
author: Brenden Conley
date: 2015-01-09 07:14:35.000000000

Patch Set 1: Code-Review-1

Build Unstable 

https://hudson.eclipse.org/egit/job/egit.gerrit/6602/ : UNSTABLE

-------------------------------------
author: Brenden Conley
date: 2015-01-09 09:31:21.000000000

Patch Set 1: -Code-Review

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

-------------------------------------
author: Brenden Conley
date: 2015-01-09 09:46:40.000000000

Patch Set 1: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit.gerrit/6605/ : SUCCESS

-------------------------------------
author: Douglas Trujillo
date: 2015-01-27 23:51:06.000000000

Abandoned

moved to stable-3.7 as https://git.eclipse.org/r/#/c/40510/

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