![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 13 Dec 2006 18:46:23 +0000 (10:46 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 13 Dec 2006 18:46:23 +0000 (10:46 -0800) | ||
| commit | e4d45dd3bb5bd8a1db2bc109f992560da22e9c4e | |
| tree | 1711624da89c387203a163227f857f8fcd0106f7 | tree | snapshot |
| parent | 37adac765a469f8f8495e2befe7afeda65a2b272 | commit | diff |
| parent | f953831e030d3ece7346bdb5c4fde4fde43c925e | commit | diff |
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()
* 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()
| merge-recursive.c | diff1 | | diff2 | | blob | history |