Merged r10490 from trunk to 2.1-stable (#11982, #11966)
explicitly define route at scm diff view.
Merged r10503 from trunk to 1.4-stable (#11966)
add functional test of sub repository diff path.
Merged r10502 from trunk to 1.4-stable (#11966)
add functional test of main repository diff path.
Merged r10490 from trunk to 1.4-stable (#11966)
Merged r10501 from trunk
set user preference diff type nil at functional tests.
add functional test of sub repository diff path (#11966)
add functional test of main repository diff path (#11966)
set user preference diff type nil at functional tests
Merged r10498 from trunk
scm: git: use with_settings instead of assigned setting at functional test
