Skip to main content

Browse the archive

Revision caa7dac163f7f7fc827da6fd4a5aba259a50e1ab authored by Junio C Hamano on 25 October 2009, 22:34:27 UTC, committed by Junio C Hamano on 25 October 2009, 22:34:27 UTC 
Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached' into maint-1.6.4
 
* jk/maint-1.6.3-ls-files-no-ignore-cached:
  ls-files: excludes should not impact tracked files
2 parent s 1c92a08 + b5227d8
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