| commit | a85e2ec04c4d7573e55cad0ff549c9defbff5a62 | |
| author | Christian Halstrick <christian.halstrick@sap.com> | |
| Fri, 7 May 2010 16:22:17 +0000 (7 18:22 +0200) | ||
| committer | Christian Halstrick <christian.halstrick@sap.com> | |
| Fri, 7 May 2010 16:22:17 +0000 (7 18:22 +0200) | ||
| tree | 3077213d4a631b81aafbde5c14f421db975b0a94 | treesnapshot (tar.gz zip) |
| parent | fb8fe0d4322db5148a5ad7fd6a9baf5ed230bca5 | commitdiff |
Revert "Prepare EGit for the new State MERGING_RESOLVED"
This reverts commit dd4a8c44bb201fb58c6031ff9324beb817e9bb9d.
That commit came in through a wrong push directly into the master
branch without going through gerrit
This reverts commit dd4a8c44bb201fb58c6031ff9324beb817e9bb9d.
That commit came in through a wrong push directly into the master
branch without going through gerrit
| org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CommitAction.java | diffblobblamehistory |