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.c | |
| 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.c')
| -rw-r--r-- | git.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -247,6 +247,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp) { "ls-tree", cmd_ls_tree, RUN_SETUP }, { "mailinfo", cmd_mailinfo }, { "mailsplit", cmd_mailsplit }, + { "merge-file", cmd_merge_file }, { "mv", cmd_mv, RUN_SETUP }, { "name-rev", cmd_name_rev, RUN_SETUP }, { "pack-objects", cmd_pack_objects, RUN_SETUP }, |