mirror of
https://gitflic.ru/project/openide/openide.git
synced 2025-12-16 22:51:17 +07:00
30 lines
1.9 KiB
HTML
30 lines
1.9 KiB
HTML
<!-- OpenIDE Project -->
|
|
<!-- Copyright (C) 2025 “Open Development Platform” Ltd. (https://openide.ru) -->
|
|
<!-- -->
|
|
<!-- This program is free software: you can redistribute it and/or modify -->
|
|
<!-- it under the terms of the GNU Affero General Public License version 3 or later as published by the Free Software Foundation. -->
|
|
<!-- -->
|
|
<!-- This program is distributed in the hope that it will be useful, -->
|
|
<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of -->
|
|
<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -->
|
|
<!-- GNU Affero General Public License for more details. -->
|
|
<!-- -->
|
|
<!-- You should have received a copy of the GNU Affero General Public License -->
|
|
<!-- along with this program. If not, see http://www.gnu.org/licenses/. -->
|
|
<html>
|
|
<head>
|
|
<meta charset="UTF-8">
|
|
<link rel="stylesheet" type="text/css" href="css/tips.css">
|
|
</head>
|
|
<body><p><b>Compare files and folders</b></p>
|
|
<p>When you are comparing files or folders, you can apply the differences between panes in the
|
|
<span class="control">Differences viewer</span> using the chevron buttons:
|
|
<img src="images/app.diff.applyNotConflictsLeft.png" alt="the Insert from left button"/>
|
|
<img src="images/app.diff.applyNotConflictsRight.png" alt="the Insert from right button"/></p>
|
|
<p>To append the contents of the current pane to the other pane, keep <span class="shortcut">Ctrl</span> pressed. The buttons will change to
|
|
<img src="images/app.diff.arrowRightDown.png" alt="the Insert below from left button"/>
|
|
<img src="images/app.diff.arrowLeftDown.png" alt="the Insert below from right button"/>.</p>
|
|
<p>To revert changes, keep <span class="shortcut">Shift</span> pressed. The <span class="control">chevrons</span> turn into
|
|
<img src="images/app.diff.remove.png" alt="the Remove button"/>.</p>
|
|
<p class="image"><img src="images/ij_tips_apply_append.png" alt="Chevron buttons" style="border: 1px solid #55555;"/></p></body>
|
|
</html> |