Commits

History for

Commits on Oct 7, 2017

count oldLines and newLines when there are conflicts

Haitao Li
authored and
kpdecker
committed
53bf384

Commits on Aug 27, 2017

Fix: Bad merge when adding new files (#189)

tyomitch
authored and
kpdecker
committed
15fef93

Commits on Jul 6, 2017

Gracefully accept invalid newStart in hunks, same as patch(1) does.

Artyom Skrobov
authored and
kpdecker
committed
d8a3635
Use regex rather than starts/ends with for parsePatch
kpdecker
committed
6cab62c

Commits on Apr 17, 2017

Sanitize filename while parsing patches

ramya-rao-a
authored and
kpdecker
committed
2fe8129

Commits on Dec 2, 2016

feat(structuredPatch): Pass options to diffLines
Kiougar
committed
663cd3f

Commits on Oct 13, 2016

removed the uncovered code
soulbeing
committed
563e502

Commits on Oct 12, 2016

more changes
soulbeing
committed
b42b679
fix quotes
soulbeing
committed
17e9a1b
add default delimiter for test cases
soulbeing
committed
8913dd3
more error fix
soulbeing
committed
53ccd48
error fix
soulbeing
committed
8440a55
Split file using all possible line delimeter instead of hard-coded "/n" and join lines back using the original delimeters
soulbeing
committed
802fa9d

Commits on Sep 16, 2016

Parse multiple files in the absence of the Index line to fix #135 issue.
ramya-rao-a
committed
f4d1579

Commits on Aug 18, 2016

Add callback argument to applyPatches `patched` option
piranna
committed
c45c703

Commits on Jun 7, 2016

Correctly handle file names containing spaces
ad-si
committed
d92e223

Commits on May 31, 2016

Add a fix for applying 0-length destination patches
chaaz
committed
d20f367

Commits on Feb 24, 2016

Relax parser when no file header name is provided
kpdecker
committed
a8df4be

Commits on Nov 6, 2015

Less restrictive regexp & 'should handle patches without Index' test
piranna
committed
3ab1df8

Commits on Nov 5, 2015

Merge remote-tracking branch 'origin/splitDiffs' into splitDiffs
piranna
committed
e9a40c3
Fix lint on regexp
piranna
committed
41e3e29

Commits on Oct 29, 2015

Removed style changes
piranna
committed
a4178de
Split diffs based on file headers instead of 'Index:' metadata
piranna
committed
acb20d3
Break distance iterator out into separate module
kpdecker
committed
048e7f7
Use explicit undefined

piranna
authored and
kpdecker
committed
88bafde

Commits on Oct 26, 2015

Split logic for fit candidates on an iterator
piranna
committed
09b7efe
Made code easier to understand & minor optimizations
piranna
committed
3908658

Commits on Oct 21, 2015

Improved code documentation
piranna
committed
c6b6a02
Consider correctly both text limits instead of fail when reaching one
piranna
committed
0c2af7b
Calculate and apply location offset where hunk context can fit
piranna
committed
720f5ae
Do sanity check of all hunks on the diff at once before start applying them
piranna
committed
836a2f8
Separated hunk sanity check from applyPatch algorythm
piranna
committed
54edda7
Fix call to 'options.loadFile' with empty index
piranna
committed
c238f85
Allow headers with several revisions
piranna
committed
d501881
Allow patchs in diff format
piranna
committed
0c9dd6d