)]}'
{
  "commit": "15bf57a18aaf10c038e2026dfe54281edbb6080a",
  "tree": "d6f3fd0ab63ff060db738273b0e4997fafd42e40",
  "parents": [
    "354b9b59b0a02ce7e32a7b0c10caaa1e3532f22b"
  ],
  "author": {
    "name": "Junio C Hamano",
    "email": "junkio@cox.net",
    "time": "Wed Nov 30 02:16:36 2005 -0800"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "junkio@cox.net",
    "time": "Wed Nov 30 02:17:51 2005 -0800"
  },
  "message": "diff-files: show diffs with stage0 and unmerged stage at the same time.\n\nAfter thinking about it more, I realized that much of the change\nI did on top of Linus\u0027 version does not make much sense.  This\ncommit reverts it so that it by default shows diffs with stage0\npaths or stage2 paths with working tree; the unmerged stage to\nuse can be overridden with -1/-2/-3 option (-2 is the default so\nessentially is a no-op).\n\nWhen the index file is unmerged, we are by definition in the\nmiddle of a conflicting merge, and we should show the diff with\nstage 2 by default.  More importantly, paths without conflicts\nare updated in the working tree and collapsed to stage0 in the\nindex, so showing diff with stage0 at the same time does not\nhurt.  In normal cases, stage0 entries should be in sync with\nthe working tree files and does not clutter the output.  It even\nhelps the user to realize that the working tree has local\nchanges unrelated to the merge and remember to be careful not to\ndo a \"git-commit -a\" after resolving the conflicts.\n\nWhen there is no unmerged entries, giving diff_unmerged_stage a\ndefault value of 2 does not cause any harm, because it would not\nbe used anyway.  So in all, always showing diff between stage0\npaths and unmerged entries from a stage (defaulting to 2) is the\nright thing to do, as Linus originally did.\n\nSigned-off-by: Junio C Hamano \u003cjunkio@cox.net\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "b45d1e69da30cae6fad7eec3694c1768774519b8",
      "old_mode": 33188,
      "old_path": "Documentation/git-diff-files.txt",
      "new_id": "67f51265e6aeadf85db582fe89c2c5752b36745a",
      "new_mode": 33188,
      "new_path": "Documentation/git-diff-files.txt"
    },
    {
      "type": "modify",
      "old_id": "bbeeea7988bf487930b42dfc4a50f4f8394c2795",
      "old_mode": 33188,
      "old_path": "diff-files.c",
      "new_id": "6c0696c34f0af95acbfe06f644f7df7fb1e93509",
      "new_mode": 33188,
      "new_path": "diff-files.c"
    }
  ]
}