path: root/xdiff-interface.c
AgeCommit message (Expand)Author
2011-05-15add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder
2010-12-26Merge branch 'rs/maint-diff-fd-leak' into maintJunio C Hamano
2010-12-26close file on error in read_mmfile()René Scharfe
2010-09-10xdiff-interface.c: always trim trailing space from xfuncname matchesBrandon Casey
2010-05-04Merge branch 'maint-1.7.0' into maintJunio C Hamano
2010-05-04remove ecb parameter from xdi_diff_outf()René Scharfe
2010-02-17refactor duplicated fill_mm() in checkout and merge-recursiveMichael Lukashov
2009-07-02userdiff: add xdiff_clear_find_func()René Scharfe
2009-03-08Remove unused function scope local variablesBenjamin Kramer
2008-11-26xdiff-interface.c: remove 10 duplicated linesJim Meyering
2008-11-09Merge branch 'rs/blame'Junio C Hamano
2008-10-25add xdi_diff_hunks() for callers that only need hunk lengthsRené Scharfe
2008-10-17Merge branch 'maint'Junio C Hamano
2008-10-16xdiff-interface.c: strip newline (and cr) from line before pattern matchingBrandon Casey
2008-10-03xdiff-interface.c: strip newline (and cr) from line before pattern matchingBrandon Casey
2008-09-29Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce
2008-09-29Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce
2008-09-20diff: fix "multiple regexp" semantics to find hunk header commentJunio C Hamano
2008-09-19Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano
2008-09-19diff.c: associate a flag with each pattern and use it for compiling regexBrandon Casey
2008-08-31merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano
2008-08-14xdiff-interface: hide the whole "xdiff_emit_state" business from the callerJunio C Hamano
2008-08-14Use strbuf for struct xdiff_emit_state's remainderBrian Downing
2008-08-14Make xdi_diff_outf interface for running xdiff_outf diffsBrian Downing
2008-03-14Merge branch 'maint'Junio C Hamano
2008-03-14merge-file: handle empty files gracefullyJohannes Schindelin
2008-02-22Avoid unnecessary "if-before-free" tests.Jim Meyering
2007-12-21Re(-re)*fix trim_common_tail()Linus Torvalds
2007-12-16Re-re-re-fix common tail optimizationJunio C Hamano
2007-12-16trim_common_tail: brown paper bag fix.Jeff King
2007-12-14xdiff tail trimming: use correct type.Junio C Hamano
2007-12-14xdi_diff: trim common trailing linesJunio C Hamano
2007-12-14xdl_diff: identify call sites.Junio C Hamano
2007-07-06Per-path attribute based hunk header selection.Junio C Hamano
2007-06-07War on whitespaceJunio C Hamano
2007-06-05Move buffer_is_binary() to xdiff-interface.hJohannes Schindelin
2007-03-07Cast 64 bit off_t to 32 bit size_tShawn O. Pearce
2006-12-22move read_mmfile() into xdiff-interfaceJohannes Schindelin
2006-08-27Use xrealloc instead of reallocJonas Fonseca
2006-04-07Match ofs/cnt types in diff interface.Junio C Hamano
2006-04-05combine-diff: move the code to parse hunk-header into common library.Junio C Hamano
2006-04-05combine-diff: refactor built-in xdiff interface.Junio C Hamano