Mercurial > hgbook
diff ja/daily.tex @ 835:8a3041e6f3cb
reflect comments by Hiroshi Someya.
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Sat, 11 Jul 2009 19:25:35 +0900 |
parents | de4142983445 |
children |
line wrap: on
line diff
--- a/ja/daily.tex Fri Jul 10 02:32:17 2009 +0900 +++ b/ja/daily.tex Sat Jul 11 19:25:35 2009 +0900 @@ -430,7 +430,7 @@ %this behavior is not appropriate to your specific case. $B2?$i$+$NM}M3$G$3$N$h$&$KJQ99$,<+F0E*$KGH5Z$9$k$d$jJ}$,9%$^$7$/$J$$$H;W$o(B -$B$l$k>l9g$O!$%7%9%F%`I8=`$N$"%U%!%$%k%3%T!<%3%^%s%I!J(BUNIX$B7O%7%9%F%`$G$O(B +$B$l$k>l9g$O!$%7%9%F%`I8=`$N%U%!%$%k%3%T!<%3%^%s%I!J(BUNIX$B7O%7%9%F%`$G$O(B \command{cp}$B!K$r;H$C$F%U%!%$%k$N%3%T!<$r9T$$!$(B\hgcmd{add}$B$G?7$7$$%3%T!<$r(B $B<jF0$GDI2C$9$k$3$H$,$G$-$k!%$3$l$r<B:]$K9T$&A0(B $B$K!$(B~\ref{sec:daily:why-copy}$B@a$r:FFI$7!$$3$N$d$jJ}$N>\:Y$rF'$^$($?>e$G!$(B @@ -587,7 +587,7 @@ $BJQ99$,%3%T!<$K=>$&5!G=$,M-MQ$G$"$k$3$H$O!$$*$=$i$/MF0W$KF10U$,F@$i$l$k$H(B $B$3$m$G$"$k$H;W$o$l$k!%$H$j$o$1%j%M!<%`$KDI=>$9$k5!G=$O$-$o$a$F=EMW$G$"$k(B $B$3$H$OL@Gr$G$"$k!%$b$7$3$N5!G=$,$J$1$l$P!$%U%!%$%k$N%j%M!<%`$K$h$C$FJQ99(B -$B$OMF0W$/9T$->l$r<:$C$F$7$^$&$@$m$&!%(B +$B$O$?$d$9$/9T$->l$r<:$C$F$7$^$&$@$m$&!%(B %\subsection{Divergent renames and merging} \subsection{$BL>A0$H%^!<%8$NH/;6(B} @@ -638,8 +638,8 @@ %guide it to a suitable resolution. 2$B?M$N%f!<%6$,0[$J$k(B\emph{$B%=!<%9(B}$B%U%!%$%k72$rF10l$N(B\emph{$BL\E*(B}$B%U%!%$%k$K%j(B -$B%M!<%`$9$k$H>WFM$,5/$-$k!%$3$N>l9g!$(BMercurial$B$ODL>o$N%^!<%85!9=$r5/F0$7!$(B -$B%f!<%6$KE,@Z$J2r7h$rB%$9!%(B +$B%M!<%`$9$k$H%3%s%U%j%/%H$,5/$-$k!%$3$N>l9g!$(BMercurial$B$ODL>o$N%^!<%85!9=$r(B +$B5/F0$7!$%f!<%6$KE,@Z$J2r7h$rB%$9!%(B %\subsection{Other name-related corner cases} \subsection{$BL>A0$K4XO"$7$?$$$/$D$+$NLdBj(B}