| commit | 35d5dd87b65e659ae56c15ce2d54ed85d55748cf | |
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | |
| Wed, 19 Dec 2012 20:05:50 +0000 (19 21:05 +0100) | ||
| committer | Matthias Sohn <matthias.sohn@sap.com> | |
| Wed, 19 Dec 2012 22:38:28 +0000 (19 23:38 +0100) | ||
| tree | 34cc710d556b57c18d0035800de0c8a539272c68 | treesnapshot (tar.gz zip) |
| parent | e5100f938abbddfb2767600b4f1e640f43876d1a | commitdiff |
Suggest HEAD version in the MergeTool dialog
The workspace file is premerged and full of conflict markers intended
for manual resolution. Using the workspace version with a merge tool
is most confusing to users.
Change-Id: I6863ffe4e3731ce618d133c737f15905da8b3273
The workspace file is premerged and full of conflict markers intended
for manual resolution. Using the workspace version with a merge tool
is most confusing to users.
Change-Id: I6863ffe4e3731ce618d133c737f15905da8b3273
| org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/MergeModeDialog.java | diffblobblamehistory |