diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-01-09 13:53:47 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-01-09 13:53:47 +0000 |
| commit | 1ff52e5c5a58cd9cfe6f5c73f0af293673a095bf (patch) | |
| tree | f81afdab7570d0b14157f7bb9764f62564972edd /lib/redmine | |
| parent | 08c093bc8507035078dbb370f261cf1e10afefbf (diff) | |
| download | redmine-1ff52e5c5a58cd9cfe6f5c73f0af293673a095bf.tar.gz redmine-1ff52e5c5a58cd9cfe6f5c73f0af293673a095bf.zip | |
scm: mercurial: add --git option in 'hg diff' (#7253).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4668 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine')
| -rw-r--r-- | lib/redmine/scm/adapters/mercurial_adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb index 1045a60e8..e4f694ad4 100644 --- a/lib/redmine/scm/adapters/mercurial_adapter.rb +++ b/lib/redmine/scm/adapters/mercurial_adapter.rb @@ -159,7 +159,7 @@ module Redmine else diff_args = "-c #{hgrev(identifier_from)}" end - cmd = "#{HG_BIN} -R #{target('')} diff --nodates #{diff_args}" + cmd = "#{HG_BIN} -R #{target('')} diff --nodates --git #{diff_args}" cmd << " -I #{target(path)}" unless path.empty? diff = [] shellout(cmd) do |io| |