hgbook
diff en/tour-merge.tex @ 321:f79542a53cb2
Corrected small typo
author | Nicolas Cavigneaux <nico@bounga.org> |
---|---|
date | Thu Jan 15 10:12:53 2009 +0100 (2009-01-15) |
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 Jan 15 10:12:53 2009 +0100 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