hgbook
diff en/tour-merge.tex @ 314:231c8469a0ec
Removed a paragraph that is no longer true as of Subversion 1.5.
author | Sean Russell <ser@ser1.net> |
---|---|
date | Thu Aug 21 23:07:36 2008 -0400 (2008-08-21) |
parents | 34943a3d50d6 |
children | 1a4b507935de |
line diff
1.1 --- a/en/tour-merge.tex Tue May 15 16:24:20 2007 -0700 1.2 +++ b/en/tour-merge.tex Thu Aug 21 23:07:36 2008 -0400 1.3 @@ -180,7 +180,7 @@ 1.4 \end{figure} 1.5 1.6 For each conflicting portion of the file, we can choose to resolve 1.7 -thhe conflict using some combination of text from the base version, 1.8 +the conflict using some combination of text from the base version, 1.9 ours, or theirs. We can also manually edit the merged file at any 1.10 time, in case we need to make further modifications. 1.11