diff options
| author | git <svn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-04-29 01:00:20 +0900 |
|---|---|---|
| committer | git <svn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-04-29 01:00:20 +0900 |
| commit | 75260d36b591a6c9c6f183648434b3c1026e1cd8 (patch) | |
| tree | 0552cfa272dc6200b28564882b09b1cb127447a5 /tool/merger.rb | |
| parent | 991e32681eac3c675ef796f5691a6786e99c3fb0 (diff) | |
| download | ruby-75260d36b591a6c9c6f183648434b3c1026e1cd8.tar.gz | |
* remove trailing spaces.
Diffstat (limited to 'tool/merger.rb')
| -rwxr-xr-x | tool/merger.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tool/merger.rb b/tool/merger.rb index 12a654a08d..125f349709 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -185,9 +185,9 @@ class << Merger system('git', 'diff', file) end end - + private - + def svn_mode? return @svn_mode if defined?(@svn_mode) @svn_mode = system("svn info > /dev/null 2>&1") |