4 Commits

Author	SHA1	Message	Date
Johannes Schindelin	5771907a57	git-merge-file: refuse to merge binary files ... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2007-06-04 23:10:29 -07:00
Johannes Schindelin	7cab5883ff	move read_mmfile() into xdiff-interface ... read_file() was a useful function if you want to work with the xdiff stuff, so it was renamed and put into a more central place. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>	2006-12-21 23:10:14 -08:00
Johannes Schindelin	fbe0b24ca5	merge-file: support -p and -q; fix compile warnings ... Now merge-file also understands --stdout and --quiet options. While at it, two compile warnings were fixed. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>	2006-12-06 10:04:00 -08:00
Johannes Schindelin	ba1f5f3537	Add builtin merge-file, a minimal replacement for RCS merge ... merge-file has the same syntax as RCS merge, but supports only the "-L" option. For good measure, a test is added, which is quite minimal, though. [jc: further fix for compliation errors included.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>	2006-12-06 10:00:24 -08:00