Merged r10502 from trunk to 2.1-stable (#11982, #11966)
add functional test of main repository diff path.
Authored by: tmaruyama 2012-09-28
Parent: [r10509]
Child: [r10511]