
diff -r c592f2304cff -r 48747fbfe47a versionControl/vcs.tex
--- a/versionControl/vcs.tex	Sun Jan 30 20:14:31 2011 +0530
+++ b/versionControl/vcs.tex	Sun Jan 30 20:15:30 2011 +0530
@@ -435,8 +435,8 @@
   \item You now get a diff view with 3 panes 
     \begin{itemize}
     \item First --- current file
-    \item Second --- file with your changes
-    \item Third --- \typ{changesets} that you pulled
+    \item Second --- \typ{changesets} that you pulled
+    \item Third --- file before you made your changes
     \end{itemize}
   \item Resolve conflict and save
   \item \typ{hg commit}; \typ{hg push}




