diff options
Diffstat (limited to 'versionControl')
| -rw-r--r-- | versionControl/vcs.tex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/versionControl/vcs.tex b/versionControl/vcs.tex index 2ce12cc..e9ce68b 100644 --- a/versionControl/vcs.tex +++ b/versionControl/vcs.tex @@ -435,8 +435,8 @@ a.out id1.txt id2.txt identifier.cpp id.txt lex pda1.cpp pda2.cpp pda.cp \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} |