summaryrefslogtreecommitdiff
path: root/xdiff-interface.c
AgeCommit message (Expand)AuthorFilesLines
2008-10-17Merge branch 'maint'Libravatar Junio C Hamano1-0/+10
2008-10-16xdiff-interface.c: strip newline (and cr) from line before pattern matchingLibravatar Brandon Casey1-1/+11
2008-10-02xdiff-interface.c: strip newline (and cr) from line before pattern matchingLibravatar Brandon Casey1-1/+11
2008-09-29Merge branch 'bc/master-diff-hunk-header-fix'Libravatar Shawn O. Pearce1-9/+12
2008-09-29Merge branch 'jc/better-conflict-resolution'Libravatar Shawn O. Pearce1-0/+20
2008-09-20diff: fix "multiple regexp" semantics to find hunk header commentLibravatar Junio C Hamano1-7/+10
2008-09-18Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixLibravatar Junio C Hamano1-2/+2
2008-09-18diff.c: associate a flag with each pattern and use it for compiling regexLibravatar Brandon Casey1-2/+2
2008-08-30merge.conflictstyle: choose between "merge" and "diff3 -m" stylesLibravatar Junio C Hamano1-0/+20
2008-08-14xdiff-interface: hide the whole "xdiff_emit_state" business from the callerLibravatar Junio C Hamano1-5/+18
2008-08-13Use strbuf for struct xdiff_emit_state's remainderLibravatar Brian Downing1-22/+10
2008-08-13Make xdi_diff_outf interface for running xdiff_outf diffsLibravatar Brian Downing1-1/+12
2008-03-14Merge branch 'maint'Libravatar Junio C Hamano1-2/+2
2008-03-13merge-file: handle empty files gracefullyLibravatar Johannes Schindelin1-2/+2
2008-02-22Avoid unnecessary "if-before-free" tests.Libravatar Jim Meyering1-2/+1
2007-12-20Re(-re)*fix trim_common_tail()Libravatar Linus Torvalds1-4/+7
2007-12-16Re-re-re-fix common tail optimizationLibravatar Junio C Hamano1-1/+1
2007-12-16trim_common_tail: brown paper bag fix.Libravatar Jeff King1-5/+4
2007-12-14xdiff tail trimming: use correct type.Libravatar Junio C Hamano1-3/+2
2007-12-13xdi_diff: trim common trailing linesLibravatar Junio C Hamano1-1/+33
2007-12-13xdl_diff: identify call sites.Libravatar Junio C Hamano1-0/+5
2007-07-06Per-path attribute based hunk header selection.Libravatar Junio C Hamano1-0/+71
2007-06-07War on whitespaceLibravatar Junio C Hamano1-2/+0
2007-06-04Move buffer_is_binary() to xdiff-interface.hLibravatar Johannes Schindelin1-0/+8
2007-03-07Cast 64 bit off_t to 32 bit size_tLibravatar Shawn O. Pearce1-3/+5
2006-12-21move read_mmfile() into xdiff-interfaceLibravatar Johannes Schindelin1-0/+19
2006-08-26Use xrealloc instead of reallocLibravatar Jonas Fonseca1-6/+6
2006-04-06Match ofs/cnt types in diff interface.Libravatar Junio C Hamano1-4/+4
2006-04-05combine-diff: move the code to parse hunk-header into common library.Libravatar Junio C Hamano1-0/+46
2006-04-05combine-diff: refactor built-in xdiff interface.Libravatar Junio C Hamano1-0/+58
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 00:04:44 +0000