From 1ff52e5c5a58cd9cfe6f5c73f0af293673a095bf Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sun, 9 Jan 2011 13:53:47 +0000 Subject: [PATCH] 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 --- lib/redmine/scm/adapters/mercurial_adapter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb index 1045a60e..e4f694ad 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| -- 2.11.0