blob: c93afc07a25a661fe4117c3d62e3c1a954436bb7 [file] [log] [blame]
<html><head><title>Quick Diff</title>
<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css>
<meta NAME="keywords" content="">
<meta NAME="since" content="">
</head>
<body>
<h2>Quick Diff</h2>
<p>Since: <br>
Last Modified: $Date: 2004/05/31 20:01:23 $</p>
<p>Enable CVS quick diff for text and java files via the Workbench > Editors > QuickDiff preference. Then try the following
scenarios.</p>
<ol>
<li>Open a file and make changes to it. You will see the quickdiff annotations
marking the changes. Next, run Team > Replace with latest. The annotations are
removed and the file is clean.
<li>same as 1 but this time instead commit the file. The quickdiff annotations
are removed and the file is clean.
<li>checkout two copies of the same project. Open file1 from both projects. Make
changes to file1 in project1 and commit the change. Synchronize project2 and
file1 from project1 will show the quickdiff annotations for the new incoming
changes.
<li> same as previous but this time actually update the file. The files quickdiff
annotations are removed and the file is clean.
</ol>
</body></html>