From: Junio C Hamano <junkio@cox.net>
Date: Wed, 13 Dec 2006 18:46:23 +0000 (-0800)
Subject: Merge branch 'js/merge'
X-Git-Tag: v1.5.0-rc0~127
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e4d45dd3bb5bd8a1db2bc109f992560da22e9c4e;p=git.git

Merge branch 'js/merge'

* js/merge:
  merge-recursive: add/add really is modify/modify with an empty base
  Get rid of the dependency on RCS' merge program
  merge-file: support -p and -q; fix compile warnings
  Add builtin merge-file, a minimal replacement for RCS merge
  xdl_merge(): fix and simplify conflict handling
  xdl_merge(): fix thinko
  xdl_merge(): fix an off-by-one bug
  merge-recursive: use xdl_merge().
  xmerge: make return value from xdl_merge() more usable.
  xdiff: add xdl_merge()
---

e4d45dd3bb5bd8a1db2bc109f992560da22e9c4e