t / t4013 / diff.diff-tree_masteron commit resolve-undo: teach "update-index --unresolve" to use resolve-undo info (8aa3856)
   1$ git diff-tree master
   2$