diff options
-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") |