Mercurial > hgbook
changeset 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 | 72eab2497e12 |
| files | ja/intro.tex |
| diffstat | 1 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ja/intro.tex Thu Jun 18 16:23:58 2009 +0900 +++ b/ja/intro.tex Thu Jun 18 16:23:58 2009 +0900 @@ -942,15 +942,12 @@ %As an example, Subversion is a good choice for working with frequently %edited binary files, due to its centralised nature and support for %file locking. If you're averse to the command line, it currently has -%better GUI support than other free revision control tools. However, -%its poor merging is a substantial liability for busy projects with -%overlapping development. +%better GUI support than other free revision control tools. $BNc$($P!$IQHK$KJQ99$5$l$k%P%$%J%j%U%!%$%k$r07$&>l9g$O(BSubverrsion$B$rA*$V$N$,(B $BNI$$!%(BSubversion$B$N=8Cf7?$N@-<A$H%U%!%$%k%m%C%/$N%5%]!<%H$O%P%$%J%j%U%!%$(B $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 -$B%s4IM}%D!<%k$h$j$bM%$l$?(BGUI$B%5%]!<%H$,$"$k!%$7$+$7%^!<%85!9=$N<e$5$OF1;~$K(B -$BJB9T$7$?3+H/$G$O>/$J$+$i$LLdBj$H$J$j$&$k!%(B +$B%s4IM}%D!<%k$h$j$bM%$l$?(BGUI$B%5%]!<%H$,$"$k!%(B %I personally find Mercurial's properties of simplicity, performance, %and good merge support to be a compelling combination that has served