Merged r8760 from trunk
scm: git: add test that diff type is saved in user preference.
Authored by: tmaruyama 2012-02-04
Parent: [r8761]
Child: [r8763]
