t / t4013 / diff.diff-tree_-p_masteron commit Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1 (d9b0443)
   1$ git diff-tree -p master
   2$