Revision 4daf6fc837f7cc84335958b9d9e8a29e41b4ee8e authored by Junio C Hamano on 13 February 2012, 19:42:18 UTC, committed by Junio C Hamano on 13 February 2012, 19:42:18 UTC
* js/add-e-submodule-fix: add -e: do not show difference in a submodule that is merely dirty
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
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...