Andrew's git / gitweb.git / t/t4013/diff.diff-tree_master
?
t / t4013 / diff.diff-tree_masteron commit git notes merge: Manual conflict resolution, part 2/2 (6abb365)
   1$ git diff-tree master
   2$