# HG changeset patch
# User Yoshiki Yazawa <yaz@honeyplanet.jp>
# Date 1245309838 -32400
# Node ID 40229e419ca6f153ea0d2f5ad7bed45ff97a0d3f
# Parent  ac38c95a2ace690156c58ee5b6afc3ecae610c6b
Propagate 22ecadf9f413

Another obsolete SVN merge comment fixed

diff -r ac38c95a2ace -r 40229e419ca6 ja/intro.tex
--- 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.
 
 例えば，頻繁に変更されるバイナリファイルを扱う場合はSubverrsionを選ぶのが
 良い．Subversionの集中型の性質とファイルロックのサポートはバイナリファイ
 ルの取り扱いに適している．コマンドラインが嫌いならば，他のフリーリビジョ
-ン管理ツールよりも優れたGUIサポートがある．しかしマージ機構の弱さは同時に
-並行した開発では少なからぬ問題となりうる．
+ン管理ツールよりも優れたGUIサポートがある．
 
 %I personally find Mercurial's properties of simplicity, performance,
 %and good merge support to be a compelling combination that has served