Skip to main content

Browse the archive

Revision 6720e95b305737fddc776f2904c339a0701e6ae2 authored by René Scharfe on 26 December 2008, 10:12:15 UTC, committed by Junio C Hamano on 27 December 2008, 03:09:56 UTC 
daemon: cleanup: factor out xstrdup_tolower()
 
Add xstrdup_tolower(), a helper to get a lower case copy of a
string, and use it in two cases.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent a583971
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