Merge branch 'ph/parseopt'
authorShawn O. Pearce <spearce@spearce.org>
Thu, 9 Oct 2008 17:19:08 +0000 (10:19 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Thu, 9 Oct 2008 17:19:08 +0000 (10:19 -0700)
commitc9618ff939aeb5e895d90c2478db989038eccc26
tree189c0f633079ce7d5481a0835b1522309e6e10e3
parent86193807cf196ee87e464ed3c4025597de597d56
parentd249610792c6a42a7d51c2f5790025569f6cb5fd
Merge branch 'ph/parseopt'

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