Skip to main content

Browse the archive

Staging
v0.5.2
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 18023c20656265364d4d1805f435e8420ab70687 authored by Horst H. von Brand on 28 March 2008, 14:09:04 UTC, committed by Junio C Hamano on 21 May 2008, 20:05:50 UTC 
Fix recipient santitization
 
Need to quote all special characters, not just the first one

Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent e4d594c
Raw File
Tip revision: 18023c20656265364d4d1805f435e8420ab70687 authored by Horst H. von Brand on 28 March 2008, 14:09:04 UTC
Fix recipient santitization
Tip revision: 18023c2
ll-merge.h 
/*
 * Low level 3-way in-core file merge.
 */

#ifndef LL_MERGE_H
#define LL_MERGE_H

int ll_merge(mmbuffer_t *result_buf,
	     const char *path,
	     mmfile_t *ancestor,
	     mmfile_t *ours, const char *our_label,
	     mmfile_t *theirs, const char *their_label,
	     int virtual_ancestor);

#endif
back to top