scm: mercurial: run both of "inline" and "side by side" diff in functional test_diff test.
Authored by: tmaruyama 2011-06-01
Parent: [r5982]
Child: [r5984]
