t / t4013 / diff.diff-tree_masteron commit Which merge_file() function do you mean? (fa2364e)
   1$ git diff-tree master
   2$