projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/gitk/gitk
[git.git]
/
diffcore.h
diff --git
a/diffcore.h
b/diffcore.h
index
91d6c63
..
dba4f17
100644
(file)
--- a/
diffcore.h
+++ b/
diffcore.h
@@
-18,7
+18,7
@@
#define MAX_SCORE 60000.0
#define DEFAULT_RENAME_SCORE 30000 /* rename/copy similarity minimum (50%) */
#define DEFAULT_BREAK_SCORE 30000 /* minimum for break to happen (50%)*/
#define MAX_SCORE 60000.0
#define DEFAULT_RENAME_SCORE 30000 /* rename/copy similarity minimum (50%) */
#define DEFAULT_BREAK_SCORE 30000 /* minimum for break to happen (50%)*/
-#define DEFAULT_MERGE_SCORE 4
5000 /* maximum for break-merge to happen (75
%)*/
+#define DEFAULT_MERGE_SCORE 4
8000 /* maximum for break-merge to happen (80
%)*/
#define MINIMUM_BREAK_SIZE 400 /* do not break a file smaller than this */
#define MINIMUM_BREAK_SIZE 400 /* do not break a file smaller than this */
@@
-101,4
+101,10
@@
void diff_debug_queue(const char *, struct diff_queue_struct *);
#define diff_debug_queue(a,b) do {} while(0)
#endif
#define diff_debug_queue(a,b) do {} while(0)
#endif
+extern int diffcore_count_changes(void *src, unsigned long src_size,
+ void *dst, unsigned long dst_size,
+ unsigned long delta_limit,
+ unsigned long *src_copied,
+ unsigned long *literal_added);
+
#endif
#endif