diff: don't show function name by default
We'd mistakenly made the -p option always on, which meant there was no
way to turn it off. It also meant that we were sometimes splitting
multibyte characters in function name, which isn't a good default.
marked working directory as branch a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
marked working directory as branch b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
marked working directory as branch c
c 5:5ca481e59b8c
a 1:dd6b440dd85a
b 4:22df7444f7c1 (inactive)
default 0:19709c5a4e75 (inactive)
-------
c 5:5ca481e59b8c
a 1:dd6b440dd85a