hgbook
diff en/tour-merge.tex @ 379:dbc78b312fc0
finished translation of tour-basic
author | Javier Rojas <jerojasro@devnull.li> |
---|---|
date | Mon Oct 27 23:29:24 2008 -0500 (2008-10-27) |
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 Mon Oct 27 23:29:24 2008 -0500 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