DESCRIPTION

[stagingView] Add "Replace With > Ours/Theirs" menu for conflicts

Note that this also requires JGit change
Ie2b3685d958c09b241991b74e6177401e8a1ebc9 for it to work for add/add
conflicts.

To get a nicer "theirs" in case of rebasing, reading some of the files
in .git/rebase-merge/ would be required.

Change-Id: I9e1ddb7bb2cf295fcb6d18ffa4393fcc6dac605e
Signed-off-by: Danika Greer xxx@xxx.xxx
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2014-12-12 23:46:03.000000000

Uploaded patch set 2.

-------------------------------------
author: Douglas Trujillo
date: 2014-12-12 23:46:43.000000000

Patch Set 2: Code-Review+2 Verified+1

rebased

-------------------------------------
author: Douglas Trujillo
date: 2014-12-12 23:49:08.000000000

Change has been successfully merged into the git repository.

-------------------------------------
author: Brenden Conley
date: 2014-12-13 00:34:02.000000000

Patch Set 2:

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

-------------------------------------
author: Brenden Conley
date: 2014-12-13 00:50:54.000000000

Patch Set 2:

Build Successful 

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

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