Workbench
+| Find Actions can open files from file system | -+ | Find Actions can open files from file system | +The Find Actions command, usually accessible with Ctrl+3, now allows to open a file if the query is the path of an existing file on the filesystem. |
| Process ID in Debugger | -Eclipse Debug framework can now show process ID (pid) of the started processes. + | Process ID in Debugger | +Eclipse Debug framework can now show process ID (pid) of the started processes.
The pid is shown (if supported by the concrete debugger implementation) in the Console
view description and Properties page for the process.
Workbench
|
| Using the dark theme | -+ | Using the dark theme | +You can use Eclipse with the default dark theme. You can select the dark theme on the |
| Now, where was I? | -Workbench editors keep a navigation history. If you open a second + | Now, where was I? | +Workbench editors keep a navigation history. If you open a second
editor while you're editing, you can press Navigate > Backward (Alt+Left Arrow, or the
-  back arrow on the workbench toolbar) to go
+ back arrow on the workbench toolbar) to go
back to the last editor. This makes working with several open editors a whole lot easier. |
| Find Actions | -+ | Find Actions | +
You can quickly find all manner of user interface elements with the Find Actions search button at the
top of the workbench window. Click the button or use the Ctrl+3 binding to switch focus to it. Matching
elements include (but are not limited to) open editors, available perspectives, views, preferences, wizards,
@@ -76,27 +79,27 @@ Workbench |
| Full Screen mode | -You can toggle the Eclipse full screen mode via shortcut + | Full Screen mode | +You can toggle the Eclipse full screen mode via shortcut (Alt+F11) or menu (Window > Appearance > Toggle Full Screen). |
| Ctrl+E editor list | -You can quickly switch editors using the Ctrl+E keybinding which + | Ctrl+E editor list | +You can quickly switch editors using the Ctrl+E keybinding which opens a list of all open editors. The list supports type-ahead to find the editor as well as allows you to close editors using a popup menu or the Delete key. |
| Like to start afresh each session? | -A setting on the Like to start afresh each session? | +A setting on the
 General >
Editors preference page closes all open editors automatically whenever you exit. This makes start-up
cleaner and a bit faster. |
|
| Automatic Save of dirty editors | -+ | Automatic Save of dirty editors | +
You can configure the automatic save of dirty editors in Eclipse via the
General > Editors > Autosave preference page which allows you to enable/disable the autosave
@@ -105,8 +108,8 @@ Workbench |
| Prevent in-place OLE editors | -By default, on Windows, OLE applications like Microsoft Word or Excel + | Prevent in-place OLE editors | +By default, on Windows, OLE applications like Microsoft Word or Excel
open as in-place editors inside of Eclipse. You can force OLE applications to open as stand-alone applications by
unchecking the "Allow in-place system editors" option on the
@@ -114,22 +117,22 @@ WorkbenchEditors preference page. |
| Opening editors using drag and drop | -You can open an editor on an item by dragging the item from a view like + | Opening editors using drag and drop | +You can open an editor on an item by dragging the item from a view like the Project Explorer or Package Explorer and dropping it over the editor area. |
| Tiling the editor work area | -+ | Tiling the editor work area | +
You can use drag and drop to modify the layout of your editor work area. Grab an editor or view tab and drag it
to the edge of the editor work area. The green drop rectangles indicate which way the editor work area will
split.
-
|
| Splitting an editor | -+ | Splitting an editor | +
To view or edit multiple sections of an editor at once, you can split / unsplit the currently active editor
via:
Workbench |
| Open editors with a single click | -Use the Open mode setting on the Open editors with a single click | +Use the Open mode setting on the
General
preference page to activate single click opening for editors. In single click mode, a single click on a file in
the Project Explorer view (and similar views) selects and immediately opens it. |
|
| Collapsing all open items | -+ | Collapsing all open items | +
Use the Collapse All button on the toolbar of the Project Explorer view (and similar views) to collapse
all expanded project and folder items.
|
| Global find/replace | -Use Global find/replace | +Use Search > File from
the main menu to specify the text that you want to replace and the scope in which you want to replace it. Then
press Replace.... |
|
| Replace from Search view | -You can replace the matches in the files by using Replace... or + | Replace from Search view | +You can replace the matches in the files by using Replace... or Replace Selected... from the context menu in the Search view. |
 Overlay for find/replace |
- + | Overlay for find/replace |
+
You can use the find/replace dialog or an integrated overlay for performing search and replace operations within an open editor
by selecting the preference under General > Editors > Text Editors.
@@ -182,8 +185,8 @@ Workbench |
| Show In System Explorer | -+ | Show In System Explorer | +
If you select a resource and right click, there is a Show In > System Explorer context menu entry
that will open the folder containing that resource in your system's file explorer.
Workbench |
| Linking view to current open editor | -+ | Linking view to current open editor | +
The resource Project Explorer view (and similar views) is not tightly linked to the currently open editor by default. This means that closing or switching editors does not change the selection in the Project Explorer view. Toggling the Link with Editor button in the Project Explorer view toolbar ties the view to always show the current file being edited. -
|
| Manual editor / view synchronization | -+ | Manual editor / view synchronization | +
The Navigate > Show In command provides a uniform way to navigate from an open editor to a view
showing the corresponding file (e.g., in the Project Explorer view), or from a file selected in one view to the
same file in a different view (e.g., from the resource Project Explorer view to the Package Explorer view).
Typing Alt+Shift+W opens a shortcut menu with the available view targets. -
|
| Quick navigation between views, editors and perspectives | -+ | Quick navigation between views, editors and perspectives | +
A look at the Window > Navigation menu reveals a number of ways to quickly navigate between the
various views, editors, perspectives, and menus in the workbench. These commands have keyword accelerators such
as Ctrl+F6 for switching between editors, Ctrl+F7 for switching between views, Ctrl+F8 for
switching between perspectives, and F12 for activating the editor.
-
To directly navigate to a particular view you can define a keyboard shortcut to a view via the
@@ -229,27 +232,27 @@ |
| Switch editors and multi-page editors | -You can use Ctrl+PageDown and Ctrl+PageUp to activate + | Switch editors and multi-page editors | +You can use Ctrl+PageDown and Ctrl+PageUp to activate the next or previous editor tab, even in multi-page editors. To switch between pages of a multi-page editor, use Alt+PageDown and Alt+PageUp. |
| Pinning editors | -+ | Pinning editors | +
When the Close editors automatically preference is active (found on the
General >
Editors preference page), you can stop an editor from being closed by using the Pin Editor
button which appears in the workbench toolbar.
-
|
| Square versus round tabs | -+ | Square versus round tabs | +
Square tabs are used by default in the IDE:
-
In order to switch back to using round tabs, you can use the preference option Use round tabs on the
|
| Reordering editor tabs | -You can rearrange the order of open editors by using drag and drop. + | Reordering editor tabs | +You can rearrange the order of open editors by using drag and drop.
Grab the editor tab and drag it to the position you want the editor to appear. When positioning editors, the
- stack icon  indicates a valid spot to
+ stack icon indicates a valid spot to
drop. |
| Middle mouse button closes tabs | -You can click on a view or editor tab with your middle mouse button to + | Middle mouse button closes tabs | +You can click on a view or editor tab with your middle mouse button to close it. If you do not have a middle mouse button, try clicking on the scroll wheel if you have one. |
| Close Tabs to the Left/Right | -The context menu of editor and view tabs offers Close Tabs to the + | Close Tabs to the Left/Right | +The context menu of editor and view tabs offers Close Tabs to the Left and Close Tabs to the Right menu to close the corresponding tabs. |
| Minimizing views and editors | -+ | Minimizing views and editors | +
Running out of space? Try minimizing your unused views to reclaim screen real-estate. Each view stack contains
a minimize icon along side the maximize icon.
-
|
| Maximizing views and editors | -You can maximize a view or editor by double-clicking on the view's + | Maximizing views and editors | +You can maximize a view or editor by double-clicking on the view's title bar or the editor's tab. Double-click again to restore it to its usual size. |
| Detached views and editors | -+ | Detached views and editors | +
It's possible to detach a view or editor so that it can be placed wherever desired, including over another
Eclipse window.
Simply drag the view by its tab to a location outside the workbench window to detach it. You can also drag @@ -299,17 +302,17 @@ Workbench |
| Restoring a perspective's layout | -Rearranging and closing the views in a perspective can sometimes render + | Restoring a perspective's layout | +Rearranging and closing the views in a perspective can sometimes render
it unrecognizable and hard to work with. To return it to a familiar state, use Reset Perspective on the
Window > Perspective
preference page. |
| User customizable + | User customizable key bindings |
- + | If you find yourself repeatedly doing some command, you might be able to streamline things by assigning a key sequence to trigger that command. Assigning new key bindings, and viewing existing bindings, is done from the Workbench |
| View all keyboard shortcuts | -+ | View all keyboard shortcuts | +
While working with your favorite editors and views in Eclipse, just press Ctrl+Shift+L to see a full
list of the currently available key bindings. This is a great way to learn what is available in the UI and to
speed up your productivity by learning more key bindings. This information is also available in the improved
@@ -329,49 +332,49 @@ Workbench'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Keys)")'> General >
Keys preference page.
-
|
| Key binding assistance | -+ | Key binding assistance | +
Eclipse supports key bindings that contain more than one key stroke. Examples of such key bindings are
Ctrl+X S (Save in the Emacs key configuration) or Alt+Shift+Q Y (Show View (View:
Synchronize) in the Default key configuration). It is hard to learn these keys, and it can also be hard to
remember them if you don't use them very often. If you initiate such a key sequence and wait a second, a little
pop-up showing you the possible completions will appear.
-
|
| Customizing toolbar and menu bar | -+ | Customizing toolbar and menu bar | +
You can customize which items appear on the main toolbar and menu bar using the Window > Perspective >
Customize Perspective command.
-
|
| Restoring deleted resources | -+ | Restoring deleted resources | +
Select a container resource and use Restore from Local History to restore deleted files. You can restore
more than one file at one time.
-
|
| Faster workspace navigation | -Faster workspace navigation | + Navigate > Open
Resource... (Ctrl+Shift+R) brings up a dialog that allows you to quickly locate and open an
editor on any file in the workspace. |
|
| Quickly find a resource | -Use the Navigate > Go To > Resource command to quickly + | Quickly find a resource | +Use the Navigate > Go To > Resource command to quickly
find a resource. If the Go To > Resource command does not appear in your perspective, you can add it by
selecting |
| Copying and moving resources | -You can drag and drop files and folders within the Project Explorer + | Copying and moving resources | +You can drag and drop files and folders within the Project Explorer view to move them around. Hold down the Ctrl key to make copies. |
| Importing files | -You can quickly import files and folders into your workspace by + | Importing files | +You can quickly import files and folders into your workspace by dragging them from the file system (e.g., from a Windows Explorer window) and dropping them into the Project Explorer view. The files and folder are always copied into the project; the originals are not affected. Copy and paste also work. |
| Exporting files | -Dragging files and folder from the Project Explorer view to the file + | Exporting files | +Dragging files and folder from the Project Explorer view to the file system (e.g., to a Windows Explorer window) exports the files and folders. The files and folder are always copied; workspace resources are not affected. Copy and paste also work. |
| Transfer preferences | -+ | Transfer preferences | +
The preferences can be transferred from one workspace to another by exporting and importing them. In addition,
it is possible to only do this for selected categories:
Workbench |
| Copy preferences during workspace switch | -+ | Copy preferences during workspace switch | +
You can copy preferences during a switch to a new or existing workspace.
|
| Workspace project management | -Use the Project > Close Project command to manage projects + | Workspace project management | +Use the Project > Close Project command to manage projects within your workspace. When a project is closed, its resources are temporarily "offline" and no longer appear in the Workbench (they are still sitting in the local file system). Closed projects require less memory. Also, since they are not examined during builds, closing a project can improve build times. |
| Describing your configuration | -When reporting a problem, it's often important to be able to capture + | Describing your configuration | +When reporting a problem, it's often important to be able to capture
details about your particular setup. The Installation Details button on the Help > About
@@ -434,25 +437,25 @@ Workbenchand save this information, and attach the saved file to your problem report. |
| Deleting completed tasks | -Use the Delete Completed Tasks command in the Task view context + | Deleting completed tasks | +Use the Delete Completed Tasks command in the Task view context menu to remove all completed tasks from the Tasks view. This is more convenient than individually selecting and deleting completed tasks. |
| Viewing resource properties | -+ | Viewing resource properties | +
Use the Properties view ( Window > Perspective > Show View > Properties) when viewing
the properties for many resources. Using this view is faster than opening the Properties dialog for each
resource.
-
|
| Extra resource information | -Label decorations are a general mechanism for showing extra information + | Extra resource information | +Label decorations are a general mechanism for showing extra information
about a resource. Use the
General > Appearance
@@ -460,20 +463,20 @@ Workbenchwant to see. |
| Filtering resources | -Most views that show resources support filtering of their items. You + | Filtering resources | +Most views that show resources support filtering of their items. You control which items are visible by applying filters or working sets. The commands to filter are found in the view menu. |
| Quick fix in Tasks view | -You can use the Quick Fix command in the Tasks view to suggest + | Quick fix in Tasks view | +You can use the Quick Fix command in the Tasks view to suggest an automatic fix for the selected item. The Quick Fix command is only enabled when there is a suggested fix. |
| Creating path variables | -+ | Creating path variables | +
When creating a linked folder or file, you can specify the target location relative to a path variable. By
using path variables, you can share projects containing linked resources without requiring team members to have
exactly the same path in the file system. You can define a path variable at the time you create a linked
@@ -485,9 +488,9 @@ Workbench |
Comparing zip archives with each other or with a
+ | Comparing zip archives with each other or with a
folder |
-
+ |
Select two zip archives or one archive and a folder in the resource Project Explorer view and choose
Compare With > Each Other from the view's popup menu. Any differences between the two
inputs are opened in a Compare editor. The top pane shows all the archive entries that differ. Double clicking
@@ -498,8 +501,8 @@ |
Workbench |
| Switch workspace | -+ | Switch workspace | +
Instead of shutting down eclipse and restarting with a different workspace you can instead use File > Switch
@@ -513,8 +516,8 @@ Workbench |
| Show workspace path | -+ | Show workspace path | +
The
General >
@@ -525,8 +528,8 @@ Workbench |
| Disabling unused capabilities | -+ | Disabling unused capabilities | +
If there are parts of the Eclipse Platform that you never use (for instance, you don't develop Plug-ins) it's possible that you can disable them from the UI entirely. Segments of the
Workbench that may be filtered can be found in the
@@ -537,8 +540,8 @@ Workbench |
| Storing the encoding of derived resources separately | -+ | Storing the encoding of derived resources separately | +
Usually the encodings for all files in a project are stored in one preferences file. If you are using a version
control system and the preferences file is shared, the encodings for all resources, including derived, are
shared along with it. To store the encodings of derived resources in a separate preferences file and avoid
@@ -549,8 +552,8 @@ Workbench |
| Debug option for resource change notifications | -+ | Debug option for resource change notifications | +
In order to help troubleshooting problems with resource change listeners and to print information about which
event triggers which listener, you can use the given debug option. To get a better picture of the flow of all
workspace change events and how other plug-ins react to those changes, you can enable this debug option by
@@ -565,8 +568,8 @@ Workbench |
| Terminate and Relaunch from history | -+ | Terminate and Relaunch from history | +
You can use the Terminate and Relaunch while launching from history option on the
@@ -581,8 +584,8 @@ Workbench |
| Launch multiple launch configurations sequentially | -+ | Launch multiple launch configurations sequentially | +
You can create a Launch Group via the Run > Run Configurations... or Run > Debug
Configurations... dialog to launch multiple launch configurations sequentially, with configurable actions
after launching each group member:
@@ -602,8 +605,8 @@ Workbench |
| Export Launch Configurations | -+ | Export Launch Configurations | +
The Export Launch Configurations wizard can be easily accessed via the context menu on Launch
Configurations. This wizard is also available with File > Export > Run/Debug > Launch
Configurations.
@@ -611,28 +614,28 @@ Workbench |
| Sort breakpoints by creation time | -+ | Sort breakpoints by creation time | +
You can use the Sort By > Creation Time option in Breakpoints view's view menu to show the
newly created breakpoints on top.
|
Editing
-| Finding a string incrementally | -Use Edit > Incremental Find Next (Ctrl+J) or Edit > + | Finding a string incrementally | +Use Edit > Incremental Find Next (Ctrl+J) or Edit > Incremental Find Previous (Ctrl+Shift+J) to enter the incremental find mode, and start typing the string to match. Matches are found incrementally as you type. The search string is shown in the status line. Press Ctrl+J or Ctrl+Shift+J to go to the next or previous match. Press Enter or Esc to exit incremental find mode. |
| Go to last edit location | -Navigate > Previous Edit Location (Ctrl+Q) takes you back to
- the place where you last made a change. A corresponding button marked |
+ Navigate > Previous Edit Location (Ctrl+Q) takes you back to
+ the place where you last made a change. A corresponding button marked  is shown in the toolbar. If this toolbar button
does not appear in your perspective, you can add it by selecting |
|
| Go to multiple edit locations | -Navigate > Previous Edit Location and Navigate > Next + | Go to multiple edit locations | +Navigate > Previous Edit Location and Navigate > Next Edit Location take you back and forward respectively in the edit locations history. |
| Shortcuts for manipulating lines | -All text editors based on the Eclipse editor framework support editing functions, + | Shortcuts for manipulating lines | +All text editors based on the Eclipse editor framework support editing functions, including moving lines up or down (Alt+Arrow Up and Alt+Arrow Down), copying lines (Ctrl+Alt+Arrow Up and Ctrl+Alt+Arrow Down), inserting a new line above or below the current line (Ctrl+Shift+Enter and Shift+Enter), and converting to lowercase or uppercase (Ctrl+Shift+Y and Ctrl+Shift+X). |
| Quick Diff: seeing what has changed as you edit | -+ | Quick Diff: seeing what has changed as you edit | +Quick Diff provides color-coded change indication while you are typing. It can be turned on for text editors using either the ruler context menu, Ctrl+Shift+Q or for all new editors on the Editing |
| Customizing the presentation of annotations | -+ | Customizing the presentation of annotations | +
You can customize the presentation of annotations in editors on the
General > Editors >
@@ -681,14 +684,14 @@ Editing |
| Next / previous navigation | -You can use Ctrl+. and Ctrl+, to navigate to the next or + | Next / previous navigation | +You can use Ctrl+. and Ctrl+, to navigate to the next or previous search match, editor error, or compare difference. These are the shortcut keys for Navigate > Next and Navigate > Previous. |
| Line delimiter support | -+ | Line delimiter support | +
You can set the line delimiter that is used when creating new text files. You can provide a single setting for
the entire workspace, using the
@@ -700,19 +703,19 @@ Editing |
| Word completion | -In any text editor you can complete a prefix to a word occurring in all + | Word completion | +In any text editor you can complete a prefix to a word occurring in all currently open editors or buffers. The default key binding for word completion is Alt+/. (Ctrl+. on the Mac). |
| Open untitled files | -A text editor can be opened without creating a file first: select + | Open untitled files | +A text editor can be opened without creating a file first: select File > New > Untitled Text File. |
| Commands to zoom in text editors | -+ | Commands to zoom in text editors | +
In text editors, you can use Zoom In (Ctrl++ or Ctrl+=) and Zoom Out
(Ctrl+-) commands to increase and decrease the font size.
Like a change in the Editing |
| Pinch to zoom in text editors | -+ | Pinch to zoom in text editors | +
To temporarily zoom the editor font in text editors, use a "pinch" gesture on a touchpad. Put two
fingers on the touchpad and move them apart or together.
To reset the original font size, rotate two fingers by at least 45o, or close and reopen the @@ -738,16 +741,16 @@ Editing |
| Browser Editor can toggle auto-refresh | -+ | Browser Editor can toggle auto-refresh | +
The Browser Editor contains a drop down option for enabling auto-refresh for local pages. When enabled,
the Browser Editor will automatically refresh if the opened file is edited and saved.
|
| Show problem markers inline | -+ | Show problem markers inline | +
You can see error, warning, and info problem markers inline in text editors supporting code minings by setting
the Show Code Minings for Annotations option on General > Editors > Text Editors preference
page.
@@ -755,35 +758,35 @@ Editing |
Ant
-| Launching from the Context menu | -You can launch an Ant build from the context menu. Select an Ant + | Launching from the Context menu | +You can launch an Ant build from the context menu. Select an Ant buildfile and then choose Run > Ant Build from the context menu. To configure options before running the build, use Run > Ant Build... which will open the launch configuration dialog. A build can also be started from the Ant editor outline context menu. |
| Specification of JRE | -You can specify the JRE that an Ant build occurs in using the + | Specification of JRE | +You can specify the JRE that an Ant build occurs in using the JRE tab of the launch configuration dialog for an Ant launch configuration. The build can be set to run in a separate JRE (the default setting) or the same JRE as the Eclipse workspace. Note that some Eclipse specific tasks require that the build occurs in the same JRE as Eclipse. |
| Running Ant targets in the Ant view | -You can double click on a target in the Ant view to run it (equivalent + | Running Ant targets in the Ant view | +You can double click on a target in the Ant view to run it (equivalent to selecting the target and choosing the Run command from the context menu). |
| Terminating Ant builds | -The Terminate command in the console (or Debug view) can be used + | Terminating Ant builds | +The Terminate command in the console (or Debug view) can be used to terminate an Ant build running in the background. |
| Ant output and hyperlinks | -+ | Ant output and hyperlinks | +
The output from Ant builds is written to the Console view in
the same hierarchical format seen when running Ant from the command line. Ant tasks (for example
@@ -794,8 +797,8 @@ Ant |
| Ant can find it | -When the Run > External Tools > Run As > Ant Build + | Ant can find it | +When the Run > External Tools > Run As > Ant Build launch shortcut is used, it searches for the buildfile to execute starting in the folder of the selected resource and working its way upwards (some will recognize this as Ant's "-find" feature). The names of buildfiles to search for are specified in the Ant page. |
Help
-| Show in external window | -Having trouble reading help topics from the Help view/tray? Use the
-  Show in external
+ | Show in external window | +Having trouble reading help topics from the Help view/tray? Use the
+ Show in external
window button from the toolbar to view the document in the full help window. |
| Find that topic | -While browsing a searched topic, you can find out where that topic is
- in the table of contents by using the  Find that topic |
+ While browsing a searched topic, you can find out where that topic is
+ in the table of contents by using the Show in table of contents button in the toolbar. |
|
| Bookmarks | -You can keep your own list of bookmarks to pages in help books. Create
- a bookmark with the  Bookmark
- Document button on the toolbar of the Help browser. The bookmarks show up in the |
+ You can keep your own list of bookmarks to pages in help books. Create
+ a bookmark with the Bookmark
+ Document button on the toolbar of the Help browser. The bookmarks show up in the  Bookmarks tab. |
|
| Infopops | -If you prefer the yellow pop-ups (infopops) used in previous releases + | Infopops | +If you prefer the yellow pop-ups (infopops) used in previous releases
for context-sensitive help, you can configure Help to use these instead of the Help view/tray from the
@@ -835,25 +838,25 @@ Helppreference page. |
| Cheat Sheets | -Cheat sheets provide step by step guidance on how to perform common + | Cheat Sheets | +Cheat sheets provide step by step guidance on how to perform common
tasks. To see what cheat sheets exist use the Help > Cheat
Sheets... menu item. This menu item may not appear in all perspectives. |
| Cheat Sheet State | -A cheat sheet will remember which steps you have performed even if you + | Cheat Sheet State | +A cheat sheet will remember which steps you have performed even if you close the cheat sheet view, open another cheat sheet or exit Eclipse. |
Team
-| Determining who last modified a line with the Show Revision + | Determining who last modified a line with the Show Revision Information command | -The Show Revision Information command allows you to pick any + | The Show Revision Information command allows you to pick any
file and get a listing of who changed what line and when. The Team > Show Revision Information action
is available from the Project and Package Explorers, and the text editor context menus. The action works in a
Quick Diff flavor and displays the annotations in the vertical ruler at the left of the editor. It can also be
@@ -861,29 +864,29 @@ Teamoff the annotations, select Revisions > Hide Revision Information from the ruler context menu. |
| Working set for imported team projects | -+ | Working set for imported team projects | +
There is an option to create a working set for projects imported into the workspace via
Import > Team Project
Set. This works for all types of repositories.
-
|
| Comparing different versions | -Select any folder or file in the project explorer and choose Compare + | Comparing different versions | +Select any folder or file in the project explorer and choose Compare With from context menu to compare it against another version, branch, or date. |
| Show ancestor pane in 3-way compares | -+ | Show ancestor pane in 3-way compares | +
Whenever a team operatoin results in a conflict, it is helpful to view the common ancestor on which the two
conflicting versions are based.
You can view the common ancestor by toggling the Show Ancestor Pane button in the compare viewer's local toolbar. -
If you always want to have the ancestor pane open automatically for conflicts, you can check the option
Initially show ancestor pane on the Text Compare tab of the
@@ -892,12 +895,12 @@ |
| Merge in Compare editor | -+ | Merge in Compare editor | +
You can merge conflicting changes in the compare editor with one click. Hover over the small square in the
middle of the line connecting two ranges of an incoming or conflicting change. A button appears that allows you
to accept the change.
-
Note that for this the option Connect ranges with single line on the
|
