Eskil

<title>Changes</title>

Upcoming changes (not yet released):

  *  TBD

Changes in v2.8.3 (2018-06-13):

  *  More features in Four-way diff.
  *  Better visibility that commit happened.
  *  Shortcuts in preprocess dialog for common patterns.

Changes in v2.8.2 (2018-05-13):

  *  Added Four-way diff, for comparing changes.
  *  Bug-fix in revision handling for Fossil.

Changes in v2.8.1 (2018-01-14):

  *  Repaired plugins for directory diff (broken by multi plugin in 2.8.0).
  *  Added -excludedir and -excludefile options for directory diff.
  *  Handle GIT revisions better for directory diff.
  *  Support -nocase in directory diff.
  *  Directory diff no longer shortcuts for files with same size&mtime.
  *  Removed support for old RCS style -rREV command line.
  *  Corrected detected of Emacs for Registry. (Broken in 2.7.4)

Changes in v2.8.0 (2017-12-05):

  *  Handle multiple plugins.
  *  Upgraded DiffUtil to 0.4.0 which is significantly faster for large files.
  *  Default pivot is now 10. Added GUI choice for pivot 1.

Changes in v2.7.4 (2017-11-30):

  *  Handle multiple preprocess definitions that can be saved with preferences.
  *  Preserve line endings when saving during Edit Mode.
  *  Added -gz flag to compare compressed files.
  *  Allow multi select in table diff.

Changes in v2.6.7 (2014-11-13):

  *  Fixed Directory Diff that stopped working in 2.6.6

Changes in v2.6.6 (2014-10-27):

  *  Avoid font error with balloon help.
  *  Store default preferences as comment in rc file.

Changes in v2.6.5 (2014-01-24):

  *  Fixed error printing patch with only deleted or inserted files.
  *  Support direct print in patch mode.
  *  Detect Subversion 1.7 working copy

<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.
Only 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.

<ul>
<li>Highlights changes within a line.</li>
<li>Matches similar lines within a changed block to better show changed
lines that are adjacent to added/removed lines.</li>
<li>Recursive directory diff.</li>
<li><a href="fossil.wiki">Fossil</a>/<a href="revision.wiki">CVS/RCS/ClearCase/GIT/SVN/BZR/HG/Perforce</a> diff.</li>
<li>Conflict <a href="merge.wiki">merge</a> and three-way merge.</li>
<li>Commit changes directly from Eskil.</li>
<li>View patch, from file or clipboard.</li>
<li><a href="print.wiki">Print</a> to PDF.</li>
<li>"Clip diff"</li>
<li><a href="plugins.wiki">Plugins</a> for preprocessing files.</li> 
<li>Alignment and block diff functions for tricky diffs.</li>
<li><a href="editmode.wiki">Edit</a> and Save file from diff window.</li>
<li><a href="starkit.wiki">Starkit</a> compare and browsing.</li>
</ul>

<a name="EskilScreenshots"></a><h3>Screenshots</h3>

<img src="eskil1.png">
<p>

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
choice to overwrite either side or browse for another file.

The following command line parameters are merge related:

  -a <file> : Ancestor file for three-way merge.

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

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

  -conflict : Treat input file as a file with merge conflict markers.

<title>Print</title>
<h1>Print to PDF</h1>

A PDF of the differences can be generated from the File->Print Pdf menu.

The PDF will be generated from the current screens, so make sure any
settings like context and ignore are done and you have regenerated the diff.

The following choices are available (command line flag in parens):

  *  Header Size. Font size to use for page header. (-printHeaderSize)
  *  Paper size. Landscape  will always be used. (-printPaper)
  *  Chars per line. See below. (-printCharsPerLine)
  *  RGB background values for diff display. Text is always black.  (-printColor*)

From the command line you can also give -printFont <ttffile/afmfile>.
See [./usage.wiki|Usage] for all command line flags.

The font size is automatically scaled to fit the given characters per line.
The GUI will give you choices that fit all or most lines in that line length.
Longer lines will be wrapped.

<title>Documentation</title>

[./changes.wiki|Changes]

[./editmode.wiki|Edit Mode]

[./fossil.wiki|Fossil Support]

[./merge.wiki|Merge]

[./plugins.wiki|Plugins]

[./print.wiki|Print]

[./revision.wiki|Revision Control Support]

[./starkit.wiki|Starkit compare]

[./starpack.wiki|Starpack generation]