DESCRIPTION

Support checking out stage with DiscardChangesOperation

For resolving conflicts, we want to be able to do `git checkout --ours`
or `git checkout --theirs` for a path.

Change-Id: Ia6d003993ad1016602ff960203b3526cd884bad2
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: Brenden Conley
date: 2014-12-12 23:46:29.000000000

Patch Set 2:

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

-------------------------------------
author: Douglas Trujillo
date: 2014-12-12 23:47:34.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:01:54.000000000

Patch Set 2:

Build Successful 

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

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