1
2
3
4
5
6
7
8
9
10
11
12
|
<title>Revision Control Support</title>
<h1>Introduction</h1>
Eskil can compare versions in meny revision control systems.
Currently RCS, CVS, Git, Fossil, Mercurial, Bazaar, Subversion, Perforce and ClearCase are supported (some features are not implemented for all systems).
If you specify only one file on the command line to Eskil, it will
automatically detect if the file is under revision control and enter revision
control mode.
By default the local file is compared against the latest checked in version.
|
|
|
1
2
3
4
5
6
7
8
9
10
11
12
|
<title>Revision Control Support</title>
<h1>Introduction</h1>
Eskil can compare versions in many revision control systems.
Currently RCS, CVS, Git, Fossil, Mercurial, Bazaar, Subversion, Perforce and ClearCase are supported (some features are not implemented for all systems).
If you specify only one file on the command line to Eskil, it will
automatically detect if the file is under revision control and enter revision
control mode.
By default the local file is compared against the latest checked in version.
|
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
|
<pre>git config --global diff.tool eskil</pre>
<pre>git config --global difftool.eskil.cmd 'eskil $LOCAL $REMOTE'</pre>
<h2>Fossil</h2>
For Fossil -r <rev> is passed to finfo, as in "fossil finfo -p <file> -r <rev>".
Additionaly, if a revision is zero or a negative integer, the log is searched backwards
for earlier versions. E.g. -1 gives the second to last version. The search
follows the current branch from the current version.
To use Eskil for conflict resolution these settings can be used.
<pre>fossil settings gmerge-command 'eskil -fine -a "%baseline" "%merge" "%original" -o "%output"' -global</pre>
|
|
|
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
|
<pre>git config --global diff.tool eskil</pre>
<pre>git config --global difftool.eskil.cmd 'eskil $LOCAL $REMOTE'</pre>
<h2>Fossil</h2>
For Fossil -r <rev> is passed to finfo, as in "fossil finfo -p <file> -r <rev>".
Additionally, if a revision is zero or a negative integer, the log is searched backwards
for earlier versions. E.g. -1 gives the second to last version. The search
follows the current branch from the current version.
To use Eskil for conflict resolution these settings can be used.
<pre>fossil settings gmerge-command 'eskil -fine -a "%baseline" "%merge" "%original" -o "%output"' -global</pre>
|