equal
deleted
inserted
replaced
433 \item What if the changes conflict? -- overlapping edits |
433 \item What if the changes conflict? -- overlapping edits |
434 \item \typ{hg push} fails; \typ{hg pull}; \typ{hg merge} |
434 \item \typ{hg push} fails; \typ{hg pull}; \typ{hg merge} |
435 \item You now get a diff view with 3 panes |
435 \item You now get a diff view with 3 panes |
436 \begin{itemize} |
436 \begin{itemize} |
437 \item First --- current file |
437 \item First --- current file |
438 \item Second --- file with your changes |
438 \item Second --- \typ{changesets} that you pulled |
439 \item Third --- \typ{changesets} that you pulled |
439 \item Third --- file before you made your changes |
440 \end{itemize} |
440 \end{itemize} |
441 \item Resolve conflict and save |
441 \item Resolve conflict and save |
442 \item \typ{hg commit}; \typ{hg push} |
442 \item \typ{hg commit}; \typ{hg push} |
443 \item Look at the `Change graph'! |
443 \item Look at the `Change graph'! |
444 \end{itemize} |
444 \end{itemize} |