From: Junio C Hamano <junkio@cox.net>
Date: Mon, 20 Mar 2006 08:51:07 +0000 (-0800)
Subject: Merge branch 'jc/merge' into next
X-Git-Tag: v1.3.0-rc1~17
X-Git-Url: https://git.octo.it/?p=git.git;a=commitdiff_plain;h=e2fc650eefb10bbf98ee782599cd23c7ee6d16de

Merge branch 'jc/merge' into next

* jc/merge:
  git-merge knows some strategies want to skip trivial merges
  generate-cmdlist: style cleanups.
  Add missing semicolon to sed command.
  unpack_delta_entry(): reduce memory footprint.
  git.el: Added a function to diff against the other heads in a merge.
  git.el: Get the default user name and email from the repository config.
  git.el: More robust handling of subprocess errors when returning strings.
---

e2fc650eefb10bbf98ee782599cd23c7ee6d16de