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 /Documentation | |
| parent | 37adac765a469f8f8495e2befe7afeda65a2b272 (diff) | |
| parent | f953831e030d3ece7346bdb5c4fde4fde43c925e (diff) | |
| download | git-e4d45dd3bb5bd8a1db2bc109f992560da22e9c4e.tar.gz git-e4d45dd3bb5bd8a1db2bc109f992560da22e9c4e.tar.xz | |
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 'Documentation')
| -rw-r--r-- | Documentation/git-merge-index.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index 6cd060108..0cf505ea8 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -40,8 +40,8 @@ If "git-merge-index" is called with multiple <file>s (or -a) then it processes them in turn only stopping if merge returns a non-zero exit code. -Typically this is run with the a script calling the merge command from -the RCS package. +Typically this is run with the a script calling git's imitation of +the merge command from the RCS package. A sample script called "git-merge-one-file" is included in the distribution. |