Skip to main content

Browse the archive

Revision bd120e36d2d3a209a39644a063d93c4ef685c4ce authored by Junio C Hamano on 17 August 2012, 03:13:45 UTC, committed by Junio C Hamano on 17 August 2012, 03:13:45 UTC 
Merge git://github.com/git-l10n/git-po to update Swedish translation
 
* git://github.com/git-l10n/git-po:
  l10n: Fixes to Swedish translation
2 parent s 2a9a19e + 5b8056c
Raw File
merge-file.h 
#ifndef MERGE_FILE_H
#define MERGE_FILE_H

extern void *merge_file(const char *path, struct blob *base, struct blob *our,
			struct blob *their, unsigned long *size);

#endif
back to top