)]}'
{
  "commit": "9678ee7ba30a76b0b5c613126e659dcb1a206091",
  "tree": "84f70d381a8af68cad07a3242bfb2673623aadcf",
  "parents": [
    "dd28abca6ab1b8c4b55fdcadeaae092fc897c063",
    "a54841e96b78203598dea6b31b9618f40f107e7b"
  ],
  "author": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Mon Jul 15 10:28:34 2013 -0700"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Mon Jul 15 10:28:34 2013 -0700"
  },
  "message": "Merge branch \u0027mv/merge-ff-tristate\u0027\n\nThe configuration variable \"merge.ff\" was cleary a tri-state to\nchoose one from \"favor fast-forward when possible\", \"always create\na merge even when the history could fast-forward\" and \"do not\ncreate any merge, only update when the history fast-forwards\", but\nthe command line parser did not implement the usual convention of\n\"last one wins, and command line overrides the configuration\"\ncorrectly.\n\n* mv/merge-ff-tristate:\n  merge: handle --ff/--no-ff/--ff-only as a tri-state option\n",
  "tree_diff": []
}
