59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
-
+
-
+
|
<pre>git diff -p --diff-filter=M master | eskil -</pre>
<h1>View all changes</h1>
If the command line option -review is used, Eskil will generate a patch
for the current tree and display it as in patch mode.
<verbatim>eskil -preview [files] </verbatim>
<verbatim>eskil -review [files] </verbatim>
E.g. in a Mercurial directory, these show the same thing:
<pre>eskil -preview</pre>
<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 directly from Eskil.
<h1>Conflict merging</h1>
|
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
|
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
|
-
+
+
+
+
+
+
+
+
+
+
+
+
+
|
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>
<h2>Mercurial</h2>
For Mercurial -r works as in "hg cat -r".
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
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
<h2>Bazaar</h2>
For Bazaar -r works as in "bzr cat -r".
<h2>ClearCase</h2>
|