Merge branch 'js/fmt-patch' into next

* js/fmt-patch:
fmt-patch: understand old <his> notation
t1300-repo-config: two new config parsing tests.
Another config file parsing fix.