From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Apr 2012 19:56:35 +0000 (-0700)
Subject: Merge branch 'jc/maint-merge-autoedit' into maint
X-Git-Tag: v1.7.9.6~1
X-Git-Url: https://git.tokkee.org/?p=git.git;a=commitdiff_plain;h=b52ab19d91015ebd6bebc83a82b2c3d64b948b36

Merge branch 'jc/maint-merge-autoedit' into maint

* jc/maint-merge-autoedit:
  merge: backport GIT_MERGE_AUTOEDIT support
---

b52ab19d91015ebd6bebc83a82b2c3d64b948b36