summaryrefslogtreecommitdiff
path: root/http-push.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-12-13 10:46:23 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-12-13 10:46:23 -0800
commite4d45dd3bb5bd8a1db2bc109f992560da22e9c4e (patch)
tree1711624da89c387203a163227f857f8fcd0106f7 /http-push.c
parentsend-pack: tighten checks for remote names (diff)
parentmerge-recursive: add/add really is modify/modify with an empty base (diff)
downloadtgif-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 'http-push.c')
0 files changed, 0 insertions, 0 deletions