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 /.gitignore | |
parent | send-pack: tighten checks for remote names (diff) | |
parent | merge-recursive: add/add really is modify/modify with an empty base (diff) | |
download | tgif-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 '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 7f2cd55088..d706dd92c6 100644 --- a/.gitignore +++ b/.gitignore @@ -60,6 +60,7 @@ git-mailsplit git-merge git-merge-base git-merge-index +git-merge-file git-merge-tree git-merge-octopus git-merge-one-file |