Mercurial > hgbook
comparison ja/cmdref.tex @ 348:32d33b238b7e
made changes to the source files to be compiled at any rate.
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Tue, 19 Aug 2008 16:03:33 +0900 |
parents | b2d447356c42 |
children | 8a3041e6f3cb |
comparison
equal
deleted
inserted
replaced
347:b3e736000aef | 348:32d33b238b7e |
---|---|
266 %binary data, those diffs cannot subsequently be applied by either | 266 %binary data, those diffs cannot subsequently be applied by either |
267 %Mercurial's \hgcmd{import} command or the system's \command{patch} | 267 %Mercurial's \hgcmd{import} command or the system's \command{patch} |
268 %command. | 268 %command. |
269 | 269 |
270 $BBgH>$,%F%-%9%H$G$"$k%U%!%$%kF1;N$d!$B?$/$N%P%$%J%j%G!<%?$,4^$^$l$k%U%!%$(B | 270 $BBgH>$,%F%-%9%H$G$"$k%U%!%$%kF1;N$d!$B?$/$N%P%$%J%j%G!<%?$,4^$^$l$k%U%!%$(B |
271 $B%kF1;N$N:9J,$r<h$k$?$a$K(B\hopt{diff}{-a}$B$r;XDj$9$k>l9g!$@8@.$5$l$?:9J,$O(B | 271 $B%kF1;N$N:9J,$r<h$k$?$a$K(B\hgopt{diff}{-a}$B$r;XDj$9$k>l9g!$@8@.$5$l$?:9J,$O(B |
272 Mercurial$B$N(B\hgcmd{import}$B%3%^%s%I$d%7%9%F%`$N(B\command{patch}$B$KMQ$$$k$3$H(B | 272 Mercurial$B$N(B\hgcmd{import}$B%3%^%s%I$d%7%9%F%`$N(B\command{patch}$B$KMQ$$$k$3$H(B |
273 $B$,$G$-$J$$!%(B | 273 $B$,$G$-$J$$!%(B |
274 | 274 |
275 %If you want to generate a diff of a binary file that is safe to use as | 275 %If you want to generate a diff of a binary file that is safe to use as |
276 %input for \hgcmd{import}, use the \hgcmd{diff}{--git} option when you | 276 %input for \hgcmd{import}, use the \hgcmd{diff}{--git} option when you |