)]}'
{
  "commit": "9800c0df412869c7949935b61581b9361fc49bd1",
  "tree": "837cb43f80452126e46ff5de641f14b7b349484f",
  "parents": [
    "9ba929ed652f5ed7707f1c684999af4ad02c4925",
    "5a139ba483efea47e103fef47afe87157e3bba77"
  ],
  "author": {
    "name": "Shawn O. Pearce",
    "email": "spearce@spearce.org",
    "time": "Mon Sep 29 11:04:20 2008 -0700"
  },
  "committer": {
    "name": "Shawn O. Pearce",
    "email": "spearce@spearce.org",
    "time": "Mon Sep 29 11:04:20 2008 -0700"
  },
  "message": "Merge branch \u0027bc/master-diff-hunk-header-fix\u0027\n\n* bc/master-diff-hunk-header-fix:\n  Clarify commit error message for unmerged files\n  Use strchrnul() instead of strchr() plus manual workaround\n  Use remove_path from dir.c instead of own implementation\n  Add remove_path: a function to remove as much as possible of a path\n  git-submodule: Fix \"Unable to checkout\" for the initial \u0027update\u0027\n  Clarify how the user can satisfy stash\u0027s \u0027dirty state\u0027 check.\n  t4018-diff-funcname: test syntax of builtin xfuncname patterns\n  t4018-diff-funcname: test syntax of builtin xfuncname patterns\n  make \"git remote\" report multiple URLs\n  diff hunk pattern: fix misconverted \"\\{\" tex macro introducers\n  diff: fix \"multiple regexp\" semantics to find hunk header comment\n  diff: use extended regexp to find hunk headers\n  diff: use extended regexp to find hunk headers\n  diff.*.xfuncname which uses \"extended\" regex\u0027s for hunk header selection\n  diff.c: associate a flag with each pattern and use it for compiling regex\n  diff.c: return pattern entry pointer rather than just the hunk header pattern\n\nConflicts:\n\tbuiltin-merge-recursive.c\n\tt/t7201-co.sh\n\txdiff-interface.h\n",
  "tree_diff": []
}