)]}'
{
  "commit": "9ba929ed652f5ed7707f1c684999af4ad02c4925",
  "tree": "434d9a7552de1c2dffaf723120fc90d83aa52743",
  "parents": [
    "c11c7a5db3676258512c4067c5279377811d3ab8",
    "3407a7a9e67b165902be85b0807e9ea789b3c67d"
  ],
  "author": {
    "name": "Shawn O. Pearce",
    "email": "spearce@spearce.org",
    "time": "Mon Sep 29 10:04:21 2008 -0700"
  },
  "committer": {
    "name": "Shawn O. Pearce",
    "email": "spearce@spearce.org",
    "time": "Mon Sep 29 10:15:07 2008 -0700"
  },
  "message": "Merge branch \u0027jc/better-conflict-resolution\u0027\n\n* jc/better-conflict-resolution:\n  Fix AsciiDoc errors in merge documentation\n  git-merge documentation: describe how conflict is presented\n  checkout --conflict\u003d\u003cstyle\u003e: recreate merge in a non-default style\n  checkout -m: recreate merge when checking out of unmerged index\n  git-merge-recursive: learn to honor merge.conflictstyle\n  merge.conflictstyle: choose between \"merge\" and \"diff3 -m\" styles\n  rerere: understand \"diff3 -m\" style conflicts with the original\n  rerere.c: use symbolic constants to keep track of parsing states\n  xmerge.c: \"diff3 -m\" style clips merge reduction level to EAGER or less\n  xmerge.c: minimum readability fixups\n  xdiff-merge: optionally show conflicts in \"diff3 -m\" style\n  xdl_fill_merge_buffer(): separate out a too deeply nested function\n  checkout --ours/--theirs: allow checking out one side of a conflicting merge\n  checkout -f: allow ignoring unmerged paths when checking out of the index\n\nConflicts:\n\tDocumentation/git-checkout.txt\n\tbuiltin-checkout.c\n\tbuiltin-merge-recursive.c\n\tt/t7201-co.sh\n",
  "tree_diff": []
}