?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: 2f6855d) | patch
Improve error reporting for pull failures due to conflicts
commit4c8c7c4ff6a74d64344459f526d1f9219d62a07d
authorRobin Rosenberg <robin.rosenberg@dewire.com>
Sun, 17 Mar 2013 17:29:31 +0000 (17 18:29 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Mon, 25 Mar 2013 02:14:13 +0000 (25 03:14 +0100)
tree2bdf64d75b144adc701a0fa0961ac065cba4f667tree | snapshot (tar.gz zip)
parent2f6855d603cbe0f3c9108f80a874f76dac225bebcommit | diff
Improve error reporting for pull failures due to conflicts

Change-Id: I9d64db17f2924ac2726aeedc83e55e9fdf653e15
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java diff | blob | blame | history
org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullResultDialog.java diff | blob | blame | history
org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseResultDialog.java diff | blob | blame | history
org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties diff | blob | blame | history