Mercurial > hgbook
comparison ja/cmdref.tex @ 835:8a3041e6f3cb
reflect comments by Hiroshi Someya.
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Sat, 11 Jul 2009 19:25:35 +0900 |
parents | 32d33b238b7e |
children |
comparison
equal
deleted
inserted
replaced
834:896ab6eaf1c6 | 835:8a3041e6f3cb |
---|---|
59 %diffs for files that it detects as binary. Specifying \hgopt{diff}{-a} | 59 %diffs for files that it detects as binary. Specifying \hgopt{diff}{-a} |
60 %forces \hgcmd{diff} to treat all files as text, and generate diffs for | 60 %forces \hgcmd{diff} to treat all files as text, and generate diffs for |
61 %all of them. | 61 %all of them. |
62 | 62 |
63 $B$3$N%*%W%7%g%s$,;XDj$5$l$J$1$l$P(B\hgcmd{diff}$B$O%P%$%J%j$HH=Dj$5$l$?%U%!%$(B | 63 $B$3$N%*%W%7%g%s$,;XDj$5$l$J$1$l$P(B\hgcmd{diff}$B$O%P%$%J%j$HH=Dj$5$l$?%U%!%$(B |
64 $B%k$KBP$9$k(Bdiff$B$N@8@.$r9T$J$o$J$$!%(B\hgopt{diff}{-a}$B$r;XDj$9$k$H(B | 64 $B%k$KBP$9$k(Bdiff$B$N@8@.$r9T$o$J$$!%(B\hgopt{diff}{-a}$B$r;XDj$9$k$H(B |
65 \hgcmd{diff}$B$OA4$F$N%U%!%$%k$r%F%-%9%H$H$7$F07$$!$A4$F$N%U%!%$%k$KBP$7$F(B | 65 \hgcmd{diff}$B$OA4$F$N%U%!%$%k$r%F%-%9%H$H$7$F07$$!$A4$F$N%U%!%$%k$KBP$7$F(B |
66 diff$B$r@8@.$9$k!%(B | 66 diff$B$r@8@.$9$k!%(B |
67 | 67 |
68 %This option is useful for files that are ``mostly text'' but have a | 68 %This option is useful for files that are ``mostly text'' but have a |
69 %few embedded NUL characters. If you use it on files that contain a | 69 %few embedded NUL characters. If you use it on files that contain a |
70 %lot of binary data, its output will be incomprehensible. | 70 %lot of binary data, its output will be incomprehensible. |
71 | 71 |
72 $B$3$N%*%W%7%g%s$O!$$[$\A4$F$,%F%-%9%H$@$,0lIt$K(BNUL$BJ8;z$r4^$s$G$$$k$h$&$J%U%!(B | 72 $B$3$N%*%W%7%g%s$O!$$[$\A4$F$,%F%-%9%H$@$,0lIt$K%L%kJ8;z$r4^$s$G$$$k$h$&$J(B |
73 $B%$%k$KBP$7$FM-MQ$G$"$k!%$3$N%*%W%7%g%s$r%P%$%J%j%G!<%?$,B?$/4^$^$l$k%U%!(B | 73 $B%U%!%$%k$KBP$7$FM-MQ$G$"$k!%$3$N%*%W%7%g%s$r%P%$%J%j%G!<%?$,B?$/4^$^$l$k(B |
74 $B%$%k$KE,MQ$9$k$HL50UL#$J=PNO$K$J$k$@$m$&!%(B | 74 $B%U%!%$%k$KE,MQ$9$k$HL50UL#$J=PNO$K$J$k$@$m$&!%(B |
75 | 75 |
76 \optref{diff}{b}{ignore-space-change} | 76 \optref{diff}{b}{ignore-space-change} |
77 | 77 |
78 %Do not print a line if the only change to that line is in the amount | 78 %Do not print a line if the only change to that line is in the amount |
79 %of white space it contains. | 79 %of white space it contains. |
95 %\hgopt{diff}{-p} option has no effect unless you change the value of | 95 %\hgopt{diff}{-p} option has no effect unless you change the value of |
96 %the \rcitem{diff}{showfunc} config item, as in the following example. | 96 %the \rcitem{diff}{showfunc} config item, as in the following example. |
97 %\interaction{cmdref.diff-p} | 97 %\interaction{cmdref.diff-p} |
98 | 98 |
99 $B%O%s%/%X%C%@$NCf$K4^$^$l$F$$$k4X?t$NL>A0$rI=<($9$k!%8!:w$OC1=c$JH/8+E*J}(B | 99 $B%O%s%/%X%C%@$NCf$K4^$^$l$F$$$k4X?t$NL>A0$rI=<($9$k!%8!:w$OC1=c$JH/8+E*J}(B |
100 $BK!$G9T$J$&!%$3$N5!G=$O%G%U%)%k%H$GM-8z$K$5$l$F$*$j!$(B\hgopt{diff}{-p}$B%*%W(B | 100 $BK!$G9T$&!%$3$N5!G=$O%G%U%)%k%H$GM-8z$K$5$l$F$*$j!$(B\hgopt{diff}{-p}$B%*%W(B |
101 $B%7%g%s$O2<$NNc$N$h$&$K(B\rcitem{diff}{showfunc}$B@_Dj$rJQ99$5$l$k$^$G0UL#$r$J(B | 101 $B%7%g%s$O2<$NNc$N$h$&$K(B\rcitem{diff}{showfunc}$B@_Dj$rJQ99$5$l$k$^$G0UL#$r$J(B |
102 $B$5$J$$!%(B | 102 $B$5$J$$!%(B |
103 \interaction{cmdref.diff-p} | 103 \interaction{cmdref.diff-p} |
104 | 104 |
105 \optref{diff}{r}{rev} | 105 \optref{diff}{r}{rev} |