3 commits

Author	SHA1	Message	Date
Felipe Contreras	a75d7b5409	Use 'fast-forward' all over the place ... It's a compound word. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2009-10-24 23:50:28 -07:00
Junio C Hamano	588c038ac6	Merge branch 'sb/dashless' ... * sb/dashless: Make usage strings dash-less t/: Use "test_must_fail git" instead of "! git" t/test-lib.sh: exit with small negagive int is ok with test_must_fail Conflicts: builtin-blame.c builtin-mailinfo.c builtin-mailsplit.c builtin-shortlog.c git-am.sh t/t4150-am.sh t/t4200-rerere.sh	2008-07-16 17:22:50 -07:00
Miklos Vajna	1c7b76be7d	Build in merge ... Mentored-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2008-07-07 17:50:01 -07:00

Renamed from git-merge.sh (Browse further)