Build #595 (Apr 7, 2021, 7:06:02 PM)

1. Staging view: display conflict state information (details)
2. Handle modify-delete conflicts in "Replace With->Ours/Theirs" (details)
3. Add "Replace With->Ours/Theirs" sub-menus for IFiles (details)
4. Simplify labels for "Replace With->Ours/Theirs" (details)
5. Unify determining the "theirs" commit (details)

Triggered by Gerrit: https://git.eclipse.org/r/c/egit/egit/+/178812

• v0.0.6

• origin/master

• org.eclipse.egit.core.internal.indexdiff.IndexDiffCacheTest.testAddAndRemoveGitIgnoreFileToIgnoredDir

• 26 fixed warnings