diff ja/tour-merge.tex @ 835:8a3041e6f3cb

reflect comments by Hiroshi Someya.

--- a/ja/tour-merge.tex	Fri Jul 10 02:32:17 2009 +0900
+++ b/ja/tour-merge.tex	Sat Jul 11 19:25:35 2009 +0900
@@ -84,9 +84,9 @@
 %also known.  The tip revision is thus a head, because the newest
 %revision in a repository doesn't have any children, but a repository
 %can contain more than one head.
-head$B$O;RB9$d;R$r;}$?$J$$JQ99$G$"$k!%%j%]%8%H%j$N:G?7$N%j%S%8%g%s$O;R$r;}(B
-$B$?$J$$$?$a!$(Btip$B%j%S%8%g%s$O$9$J$o$A(Bhead$B$G$"$k!%0lJ}$G%j%]%8%H%j$OJ#?t$N(B
-head$B$r;}$AF@$k!%(B
+head$B$O;R$d$=$N;RB9$r;}$?$J$$JQ99$G$"$k!%%j%]%8%H%j$N:G?7$N%j%S%8%g%s$O;R(B
+$B$r;}$?$J$$$?$a!$(Btip$B%j%S%8%g%s$O$9$J$o$A(Bhead$B$G$"$k!%0lJ}$G%j%]%8%H%j$OJ#?t(B
+$B$N(Bhead$B$r;}$AF@$k!%(B
 
 \begin{figure}[ht]
   \centering
@@ -157,8 +157,8 @@
 %until we \hgcmd{commit} the results of the merge.
 %\interaction{tour.merge.commit}
 
-$B%^!<%8$r9T$&$H!$%^!<%8$N7k2L$r(B\hgcmd{commit}$B$9$k$^$G!$(B\hgcmd{parents}$B$O(B2
-$B$D$N%Z%"%l%s%H$rI=<($9$k!%(B
+$B%^!<%8$r9T$&$H!$%^!<%8$N7k2L$r(B\hgcmd{commit}$B$9$k$^$G!$(B\hgcmd{parents}$B$O(B
+$B?F(B2$B$D$rI=<($9$k!%(B
 \interaction{tour.merge.commit}
 
 %We now have a new tip revision; notice that it has \emph{both} of
@@ -283,7 +283,7 @@
 %  most recent version from which the two versions we're trying to
 %  merge are descended.
  \item $B:8$K$"$k$N$O%U%!%$%k$N(B\emph{$B%Y!<%9(B}$B%P!<%8%g%s$G$"$k!%$3$l$O$3$l$+(B
-       $B$i%^!<%8$7$h$&$H$9$k(B2$B$D$N%P!<%8%g%s$N?F$H$J$k:G$b:G6a$N%P!<%8%g%s(B
+       $B$i%^!<%8$7$h$&$H$9$k(B2$B$D$N%P!<%8%g%s$N?F$H$J$k:G$b?7$7$$%P!<%8%g%s(B
        $B$G$"$k!%(B
 
 %\item In the middle is ``our'' version of the file, with the contents
@@ -436,7 +436,7 @@
 %use from the command line, while others work ``behind the scenes,''
 %for example adding capabilities to the server.
 
-Mercurial$B$O%3%"$r>.$5$/!$07$$$d$9$/J]$C$?$^$^5!G=$r3HD%$G$-$k=@Fp$J%(%96e(B
+Mercurial$B$O%3%"$r>.$5$/!$07$$$d$9$/J]$C$?$^$^5!G=$r3HD%$G$-$k=@Fp$J%(%/%9(B
 $B%F%s%7%g%s%a%+%K%:%`$rDs6!$7$F$$$k!%%3%^%s%I%i%$%s$+$iMxMQ$G$-$k?7$7$$%3(B
 $B%^%s%I$rDI2C$9$k$h$&$J%(%/%9%F%s%7%g%s$b$"$l$P!$L\$K8+$($J$$$H$3$m$GNc$((B
 $B$P%5!<%P$K5!G=$rDI2C$9$k$h$&$J$b$N$b$"$k!%(B