78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
|
Eskil can be used as a conflict resolution tool. See examples below for settings.
<h1>Tools Details</h1>
<h2>RCS/CVS</h2>
For RCS and CVS the arguments to -r are standard version numbers just like to their -r options. RCS style -r<crev> is allowed.
If a revision is an integer, it is added to the last number in the current version, thus giving relative versions. E.g. -1 gives the second to last version.
<h2>Subversion</h2>
For Subversion the arguments to -r are standard version numbers just like its -r option.
If a revision is a negative integer, the log is searched backwards for earlier versions.
E.g. -1 gives the second to last version.
|
|
|
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
|
Eskil can be used as a conflict resolution tool. See examples below for settings.
<h1>Tools Details</h1>
<h2>RCS/CVS</h2>
For RCS and CVS the arguments to -r are standard version numbers just like to their -r options.
If a revision is an integer, it is added to the last number in the current version, thus giving relative versions. E.g. -1 gives the second to last version.
<h2>Subversion</h2>
For Subversion the arguments to -r are standard version numbers just like its -r option.
If a revision is a negative integer, the log is searched backwards for earlier versions.
E.g. -1 gives the second to last version.
|