Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Document git read-tree --trivial
[gitweb.git]
/
xdiff
/
xdiff.h
diff --git
a/xdiff/xdiff.h
b/xdiff/xdiff.h
index e874a7c46a90104ebf586d0fc48964634f356763..9402bb0799978e181ba972a749a0ad849d2bd706 100644
(file)
--- a/
xdiff/xdiff.h
+++ b/
xdiff/xdiff.h
@@
-103,4
+103,3
@@
int xdl_merge(mmfile_t *orig, mmfile_t *mf1, const char *name1,
#endif /* #ifdef __cplusplus */
#endif /* #if !defined(XDIFF_H) */
-