Code

Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'