)]}'
{
  "commit": "1e239079f704b840778c263f35f1e299565d4a49",
  "tree": "e97798c2f77f567f308317f61444cdc69ef6a393",
  "parents": [
    "32b31ab7f3ff52eafc40033b890b313efaed8c56",
    "92a684b916edf9e0f4f7962865e62ff71a988445"
  ],
  "author": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Sat Mar 19 23:24:42 2011 -0700"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Sat Mar 19 23:24:42 2011 -0700"
  },
  "message": "Merge branch \u0027ab/i18n-basic\u0027\n\n* ab/i18n-basic:\n  i18n: \"make distclean\" should clean up after \"make pot\"\n  i18n: Makefile: \"pot\" target to extract messages marked for translation\n  i18n: add stub Q_() wrapper for ngettext\n  i18n: do not poison translations unless GIT_GETTEXT_POISON envvar is set\n  i18n: add GETTEXT_POISON to simulate unfriendly translator\n  i18n: add no-op _() and N_() wrappers\n  commit, status: use status_printf{,_ln,_more} helpers\n  commit: refer to commit template as s-\u003efp\n  wt-status: add helpers for printing wt-status lines\n\nConflicts:\n\tbuiltin/commit.c\n",
  "tree_diff": []
}
