Documentation / RelNotes / 2.0.4.txton commit am -3: do not let failed merge from completing the error codepath (c63d4b2)
   1Git v2.0.4 Release Notes
   2========================
   3
   4 * An earlier update to v2.0.2 broken output from "git diff-tree",
   5   which is fixed in this release.