Previous
Looking at file differences with the Diff/Merge tool

As the last part of this tutorial, let's look at the differences between the two versions of ansi.c . To do so:

  1. In the Change List, highlight the line:

  2. Choose Differences > Show Differences....
    A dialog appears, in which you are asked whether you are interested in 2-way or 3-way differences.
  3. Press the 2-Way button.
    The Diff/Merge tool appears. It should be similar to the following:

    Click for full size, then use Back button

    Remember that you added a comment line to the first line of ansi.c in the "Developing in a Team" tutorial. The two differences in the screen shot are related to these changes.

  4. Close the pico.shared project in the SSWE.
  5. Quit SNiFF+.
Concluding remarks
This concludes this tutorial on looking at the version control information of a SNiFF+ project. This also concludes the C tutorial. For detailed explanations of any of the concepts in this tutorial, please refer to the User's Guide. To learn more about any of the SNiFF+ tools, see the Reference Guide. To learn how you can use SNiFF+ for your C++, Java, or Fortran projects, please refer to the respective tutorials.