svn diff/diffで行末のCRを無視して比較

Posted on July 19, 2009 by siguniang — Leave a comment

Windows/Linux それぞれの環境で開発され、改行コードがまちまちな場合に便利。

$ diff --strip-trailing-cr file1 file2

ヘルプでは次の用に記載されている

–strip-trailing-cr Strip trailing carriage return on input.

svn diff では次のようにする

$ svn diff -x --ignore-eol-style

ヘルプでは次の用に記載されている

Ignore changes in EOL style

Enter your comment here...

Fill in your details below or click an icon to log in:

Email (required) (Address never made public)

Name (required)

Website

You are commenting using your WordPress.com account. ( Log Out / Change )

You are commenting using your Google+ account. ( Log Out / Change )

You are commenting using your Twitter account. ( Log Out / Change )

You are commenting using your Facebook account. ( Log Out / Change )

Connecting to %s