After doing a svn > diff games3.patch, I looked at the patch. Here is the output. Is it correct??

freddy@omg-gnus:~/Ubuntu/Documentation/ubuntu-doc/kubuntu/games/C$ ls
games2.patch  games3.patch  games.patch  games.xml  games.xml.mine  games.xml.r3922  games.xml.r3999


Index: games.xml
===================================================================
--- games.xml	(revision 3999)
+++ games.xml	(working copy)
@@ -269,7 +269,7 @@
 <para>
 <application>Lieutnant Skat</application> is
 a two player card game which follows the rules of the German game,
-<emphasis>(Offiziers)-Skat</emphasis>. The game includes various carddecks and a
+<emphasis>(Offiziers)-Skat</emphasis>. The game includes various card decks and a
 computer opponent can play for any of the players.
 </para>
 </listitem>
@@ -390,7 +390,7 @@
 <para>
 <application>KSame</application>, inspired by
 <emphasis>Same Game</emphasis> is a simple game played for a high score. The
-object to is remove as many of the same pieces that are touching for the most
+object is to remove as many of the same pieces that are touching for the most
 points. Speed, the amount of pieces removed at once, and the movement of the
 mouse over possible pieces are taken into account for the final score.
 </para>
@@ -828,10 +828,16 @@
 addition to the levels from the original game, <application>PlanetPenguin
 Racer</application> also includes additional levels which have been developed by
 the community. The object of the game is to slide down the mountain collecting
+<<<<<<< .mine
+fish as you go trying to reach the finish line in the shortest amount of time. More information about the game can be found on the <application>PlanetPenguin
+-Racer</application> website located at <ulink
+-url=" http://developer.berlios.de/projects/ppracer/"/>.
+=======
 fish as you go trying to reach the finish line in the shortest amount of time.
 More information about the game can be found on the <application>PlanetPenguin
 Racer</application> website located at <ulink
 url="http://developer.berlios.de/projects/ppracer/"/>.
+>>>>>>> .r3999
 </para>
 
 <para>
@@ -942,7 +948,7 @@
 you will not have to utilize a third-party application or emulator in order to
 play the game. However, most of the top titles at this time cannot be run
 natively but can be run with the support of an emulator. An emulator allows an
-application to run on a platform or operating system in which it wasn't intended
+application to run on a platform or Operating System in which it wasn't intended
 for. There are two popular emulators in use today in the Linux community:
 <itemizedlist>
 <listitem><para><xref linkend="games-wintitles-wine"/></para></listitem>