Skip to main content

Browse the archive

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 
Merge branch 'js/add-e-submodule-fix' into maint
 
* js/add-e-submodule-fix:
  add -e: do not show difference in a submodule that is merely dirty
2 parent s 87cb3b8 + 701825d
Raw File
userdiff.h 
#ifndef USERDIFF_H
#define USERDIFF_H

#include "notes-cache.h"

struct userdiff_funcname {
	const char *pattern;
	int cflags;
};

struct userdiff_driver {
	const char *name;
	const char *external;
	int binary;
	struct userdiff_funcname funcname;
	const char *word_regex;
	const char *textconv;
	struct notes_cache *textconv_cache;
	int textconv_want_cache;
};

int userdiff_config(const char *k, const char *v);
struct userdiff_driver *userdiff_find_by_name(const char *name);
struct userdiff_driver *userdiff_find_by_path(const char *path);

struct userdiff_driver *userdiff_get_textconv(struct userdiff_driver *driver);

#endif /* USERDIFF */
back to top