comparison ja/intro.tex @ 791:40229e419ca6

Propagate 22ecadf9f413 Another obsolete SVN merge comment fixed
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Thu, 18 Jun 2009 16:23:58 +0900
parents ac38c95a2ace
children fa1c3715254d
comparison
equal deleted inserted replaced
790:ac38c95a2ace 791:40229e419ca6
940 $B$k!%$9$Y$F$N>u67$G%Y%9%H$G$"$k%D!<%k$H$$$&$b$N$OB8:_$7$J$$!%(B 940 $B$k!%$9$Y$F$N>u67$G%Y%9%H$G$"$k%D!<%k$H$$$&$b$N$OB8:_$7$J$$!%(B
941 941
942 %As an example, Subversion is a good choice for working with frequently 942 %As an example, Subversion is a good choice for working with frequently
943 %edited binary files, due to its centralised nature and support for 943 %edited binary files, due to its centralised nature and support for
944 %file locking. If you're averse to the command line, it currently has 944 %file locking. If you're averse to the command line, it currently has
945 %better GUI support than other free revision control tools. However, 945 %better GUI support than other free revision control tools.
946 %its poor merging is a substantial liability for busy projects with
947 %overlapping development.
948 946
949 $BNc$($P!$IQHK$KJQ99$5$l$k%P%$%J%j%U%!%$%k$r07$&>l9g$O(BSubverrsion$B$rA*$V$N$,(B 947 $BNc$($P!$IQHK$KJQ99$5$l$k%P%$%J%j%U%!%$%k$r07$&>l9g$O(BSubverrsion$B$rA*$V$N$,(B
950 $BNI$$!%(BSubversion$B$N=8Cf7?$N@-<A$H%U%!%$%k%m%C%/$N%5%]!<%H$O%P%$%J%j%U%!%$(B 948 $BNI$$!%(BSubversion$B$N=8Cf7?$N@-<A$H%U%!%$%k%m%C%/$N%5%]!<%H$O%P%$%J%j%U%!%$(B
951 $B%k$N<h$j07$$$KE,$7$F$$$k!%%3%^%s%I%i%$%s$,7y$$$J$i$P!$B>$N%U%j!<%j%S%8%g(B 949 $B%k$N<h$j07$$$KE,$7$F$$$k!%%3%^%s%I%i%$%s$,7y$$$J$i$P!$B>$N%U%j!<%j%S%8%g(B
952 $B%s4IM}%D!<%k$h$j$bM%$l$?(BGUI$B%5%]!<%H$,$"$k!%$7$+$7%^!<%85!9=$N<e$5$OF1;~$K(B 950 $B%s4IM}%D!<%k$h$j$bM%$l$?(BGUI$B%5%]!<%H$,$"$k!%(B
953 $BJB9T$7$?3+H/$G$O>/$J$+$i$LLdBj$H$J$j$&$k!%(B
954 951
955 %I personally find Mercurial's properties of simplicity, performance, 952 %I personally find Mercurial's properties of simplicity, performance,
956 %and good merge support to be a compelling combination that has served 953 %and good merge support to be a compelling combination that has served
957 %me well for several years. 954 %me well for several years.
958 955