当我执行diff $REPO1/file $REPO2/file时，svn diff $REPO1/file $REPO2/file
或者使用相同文件的缩小版本进行相同的差异操作，我得到没有差异。
但是，当我执行svn merge $REPO2时，在$REPO1新签出的目录中，我收到了svn冲突。
在合并时，subversion是否会以不同方式处理缩小的文件？或者是否有一个开关，我只能用于合并的缩小的JavaScript文件？
kahmed@vm-devqa04 /extra/cr/www/developer $ diff build_8.3/htdocs/javascript/retro_audit.js build_8.2/htdocs/javascript/retro_audit.js
kahmed@vm-devqa04 /extra/co/www/developer $ diff build_8.3/htdocs/javascript/retro_audit.min.js build_8.2/htdocs/javascript/retro_audit.min.js
kahmed@vm-devqa04 /extra/co/www/developer $
kahmed@vm-devqa04 /extra/co/www/developer/MERGE-8.2-to-8.3/build_8.3 $ svn merge https://svn.hq.co.corp/co/perlapp/branches/build_8.2
--- Merging r262219 through r264152 into 'htdocs':
C htdocs/css/sass/sass_compile_ca.sh
Conflict discovered in 'htdocs/javascript/retro_audit.min.js'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: