| commit | 7efb38700f4c626126fad5c2f084848b86f5e654 | |
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | |
| Wed, 19 Dec 2012 19:53:00 +0000 (19 20:53 +0100) | ||
| committer | Matthias Sohn <matthias.sohn@sap.com> | |
| Wed, 19 Dec 2012 23:12:05 +0000 (20 00:12 +0100) | ||
| tree | 78bb2e01ac441b0d41829f9bcf13329203fc6291 | treesnapshot (tar.gz zip) |
| parent | 188e56cbf406a18774dd9469ad2005234027509c | commitdiff |
Treat a dirty worktree like a normal condition
Instead of an ugly error dialog, present the result in the merge result
dialog.
Change-Id: Iff2fc7de0237b9cb91ea78fde7334a4c62424d10
Instead of an ugly error dialog, present the result in the merge result
dialog.
Change-Id: Iff2fc7de0237b9cb91ea78fde7334a4c62424d10
| org.eclipse.egit.core/src/org/eclipse/egit/core/op/MergeOperation.java | diffblobblamehistory |