Eskil

The files on display may be edited if you turn on Edit Mode.
This is done with the Tools->Edit Mode menu.
Onle real files may be edited. If you are comparing versions fetched from a
Revision Control system, it cannot be edited.

If an edited side has empty areas, i.e. lines that are not part of the file
and only there to line up with the other side, those will be gray.

Edit mode will not allow you to enter or remove newlines freely. Only by
copying blocks from other side lines may change.

By right clicking over a change's line numbers you get options to copy
lines and blocks between the two sides, as well as the options to save a file.

<title>Edit Mode</title>
<h1>Edit Mode</h1>

The files on display may be edited if you turn on Edit Mode.
This is done with the Tools->Edit Mode menu.
Onle real files may be edited. If you are comparing versions fetched from a
[./revision.wiki|Revision Control] system, it cannot be edited.

If an edited side has empty areas, i.e. lines that are not part of the file
and only there to line up with the other side, those will be gray.

Edit mode will not allow you to enter or remove newlines freely. Only by
copying blocks from other side lines may change.

By right clicking over a change's line numbers you get options to copy
lines and blocks between the two sides, as well as the options to save a file.

See also [./merge.wiki|Merge].

<title>Merge</title>
<h1>Merge</h1>

The files on display may be merged and saved via the Tools->Merge menu.
The Merge window will also appear if you open an Ancestor File (for three-way
merge) or a Conflict File, via the File menu or command line.

In the Merge window you can navigate between differences with up/down keys
and select between left and right side with left/right keys. See the Goto
menu for other navigation keys.

With the toolbar buttons and menus you can also choose to keep both sides.
There is All Left/Right commands in the menu to select for all differences.

The text can be freely edited. Use escape key to get focus out of the text
window to allow navigating as described above.

The status bar show basic info about the selected difference. A conflict
is marked with ***. Hover over the status line to get more info.

When saving, if no output file has been previously been selected, you get the
choise to overwrite either side or browse for another file.

From the The following command line parameters are merge related:

  -a <file> : Ancestor file for threeway merge.

  -o <file> : Output file for merge result.

  -fine     : Use fine grained chunks. Left/right choice is made per line instead of per chunk.

See also [./editmode.wiki|Edit Mode], and [./revision.wiki|Revision Control Support].

<title>Documentation</title>

[./changes.wiki|Changes]

[./editmode.wiki|Edit Mode]

[./fossil.wiki|Fossil Support]

[./merge.wiki|Merge]

[./plugins.wiki|Plugins]

[./revision.wiki|Revision Control Support]

[./starkit.wiki|Starkit compare]