Merged r10252 from trunk to 1.4-stable (#11752)
scm: git: use with_settings at test_diff_truncated of functional test.
Authored by: tmaruyama 2012-09-01
Parent: [r10258]
Child: [r10260]
