diff options
| author | Stig Sandbeck Mathisen <ssm@fnord.no> | 2009-06-14 21:47:46 +0200 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-06-26 11:36:26 +1000 |
| commit | 603b9cf1a435f6662db39be66f91527a8e20c112 (patch) | |
| tree | 7056b0cbe1a0cb10c92e07bab67e738ca048c0b1 /lib/puppet/defaults.rb | |
| parent | 9bc9b5c0c062ff60af4272fd6d176b8a8a1d6c91 (diff) | |
| download | puppet-603b9cf1a435f6662db39be66f91527a8e20c112.tar.gz puppet-603b9cf1a435f6662db39be66f91527a8e20c112.tar.xz puppet-603b9cf1a435f6662db39be66f91527a8e20c112.zip | |
Change the diff default output to "unified"
Diffstat (limited to 'lib/puppet/defaults.rb')
| -rw-r--r-- | lib/puppet/defaults.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index f42f6e055..328189038 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -131,7 +131,7 @@ module Puppet ``puppetmasterd``) this provides the default environment for nodes we know nothing about." }, - :diff_args => ["", "Which arguments to pass to the diff command when printing differences between files."], + :diff_args => ["-u", "Which arguments to pass to the diff command when printing differences between files."], :diff => ["diff", "Which diff command to use when printing differences between files."], :show_diff => [false, "Whether to print a contextual diff when files are being replaced. The diff is printed on stdout, so this option is meaningless unless you are running Puppet interactively. |