51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
+
+
+
+
+
+
+
|
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.
<ul>Git</ul>
For Git -r <rev> is passed to show, as in "git show <rev>:<file>".
<pre>git config --global merge.tool eskil</pre>
<pre>git config --global mergetool.eskil.cmd 'eskil -fine -a $BASE -o $MERGED $REMOTE $LOCAL'</pre>
<pre>git config --global diff.tool eskil</pre>
<pre>git config --global difftool.eskil.cmd 'eskil $LOCAL $REMOTE'</pre>
<ul>Fossil</ul>
For Fossil -r <rev> is passed to finfo, as in "fossil finfo -p <file> -r <rev>".
<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>
|