115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
|
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
|
-
-
+
+
-
-
+
|
<pre>fossil settings gmerge-command 'eskil -fine -a "%baseline" "%merge" "%original" -o "%output"' -global</pre>
<h2>Mercurial</h2>
For Mercurial -r mostly 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
Mercurial is supported in the Directory Diff, but needs the hglist extension to
display correct file sizes and dates. If not they are faked using the file's
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.
|