Merged r10251 from trunk to 1.4-stable (#11752)
scm: git: use diff_max_lines_displayed setting at test_diff_with_rev_and_path of functional test.
Authored by: tmaruyama 2012-09-01
Parent: [r10257]
Child: [r10259]
