diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-13 10:46:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-13 10:46:23 -0800 |
| commit | e4d45dd3bb5bd8a1db2bc109f992560da22e9c4e (patch) | |
| tree | 1711624da89c387203a163227f857f8fcd0106f7 /git-cvsserver.perl | |
| parent | 37adac765a469f8f8495e2befe7afeda65a2b272 (diff) | |
| parent | f953831e030d3ece7346bdb5c4fde4fde43c925e (diff) | |
| download | git-e4d45dd3bb5bd8a1db2bc109f992560da22e9c4e.tar.gz | |
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()
Diffstat (limited to 'git-cvsserver.perl')
| -rwxr-xr-x | git-cvsserver.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsserver.perl b/git-cvsserver.perl index 197014d9e6..2a8447e253 100755 --- a/git-cvsserver.perl +++ b/git-cvsserver.perl @@ -946,7 +946,7 @@ sub req_update $log->debug("Temporary directory for merge is $dir"); - my $return = system("merge", $file_local, $file_old, $file_new); + my $return = system("git merge-file", $file_local, $file_old, $file_new); $return >>= 8; if ( $return == 0 ) |