From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 9 Oct 2008 17:19:08 +0000 (-0700)
Subject: Merge branch 'ph/parseopt'
X-Git-Tag: v1.6.1-rc1~166
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c9618ff939aeb5e895d90c2478db989038eccc26;p=git.git

Merge branch 'ph/parseopt'

* ph/parseopt:
  parse-opt: migrate builtin-merge-file.
  parse-opt: migrate git-merge-base.
  parse-opt: migrate fmt-merge-msg.
---

c9618ff939aeb5e895d90c2478db989038eccc26