39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
<pre>git diff -p --diff-filter=M master | eskil -</pre>
<ul>View all changes</ul>
If the command line option -review is used, Eskil will generate a patch
for the current tree and display it as in patch mode.
E.g. in a Mercurial directory, these show the same thing:
<pre>eskil -preview</pre>
<pre>hg diff | eskil -</pre>
If file names are given after -review, only the listed files are included. If supported,
the Commit button will be enabled allowing the viewed differences to be committed.
<ul>RCS/CVS</ul>
|
|
|
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
<pre>git diff -p --diff-filter=M master | eskil -</pre>
<ul>View all changes</ul>
If the command line option -review is used, Eskil will generate a patch
for the current tree and display it as in patch mode.
E.g. in a Mercurial directory, these show the same thing:
<pre>eskil -review</pre>
<pre>hg diff | eskil -</pre>
If file names are given after -review, only the listed files are included. If supported,
the Commit button will be enabled allowing the viewed differences to be committed.
<ul>RCS/CVS</ul>
|
76
77
78
79
80
81
82
83
84
85
86
87
88
89
|
follows the current branch from the current version.
<pre>fossil settings gmerge-command 'eskil -fine -a "%baseline" "%merge" "%original" -o "%output"' -global</pre>
<ul>Mercurial</ul>
For Mercurial -r works as in "hg cat -r".
<ul>Bazaar</ul>
For Bazaar -r works as in "bzr cat -r".
<ul>ClearCase</ul>
|
>
>
>
>
>
>
>
>
>
>
>
>
|
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
|
follows the current branch from the current version.
<pre>fossil settings gmerge-command 'eskil -fine -a "%baseline" "%merge" "%original" -o "%output"' -global</pre>
<ul>Mercurial</ul>
For Mercurial -r works as in "hg cat -r".
However, Eskil interprets zero or negative numbers as going back from the tip, i.e. -1 is one step back, corresponding to -2 in Mercurial.
Mercurial is supported in the Directory Diff, however the displayed file sizes
and dates are faked since the current implementation cannot extract that
information from the repository. The fake numbers are taken from the file's
sha1 and thus is unique per file and gives a correct result in comparison.
To use Eskil for conflict resolution these config settings can be used.
[merge-tools]
eskil.args = -fine -a $base $other $local -o $output
eskil.priority = 1
<ul>Bazaar</ul>
For Bazaar -r works as in "bzr cat -r".
<ul>ClearCase</ul>
|