Skip to main content

Browse the archive

Revision 3db964b551827e25f897cc75ffd8e520ee8b48cd authored by Stephen Boyd on 05 May 2009, 05:18:42 UTC, committed by Junio C Hamano on 06 May 2009, 05:08:58 UTC 
git-am.txt: add an 'a', say what 'it' is, simplify a sentence
 
It's nice to know that 'it' is git-am or the subject line. Whitespace
implies characters so just remove characters.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent a48f5d7
Raw File
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