Commits

Breadcrumbs

History for

onmaster

User selector

All users

All time

Commit history

Commits on Oct 7, 2017

• comparator for custom equality checks

  

  Thomas Schorn

  authored and

  kpdecker

  committed
  30e141eView commit details

  Copy full SHA for 30e141e

  View code at this pointBrowse repository at this point

• count oldLines and newLines when there are conflicts

  

  Haitao Li

  authored and

  kpdecker

  committed
  53bf384View commit details

  Copy full SHA for 53bf384

  View code at this pointBrowse repository at this point

• Fix: diffArrays can compare falsey items

  

  pedrottimark

  authored and

  kpdecker

  committed
  9e24284View commit details

  Copy full SHA for 9e24284

  View code at this pointBrowse repository at this point

Commits on Sep 3, 2017

• Revert "Upgrade misc deps"

  Show description for 5791a6d
  kpdecker

  committed
  5791a6dView commit details

  Copy full SHA for 5791a6d

  View code at this pointBrowse repository at this point

• Upgrade misc deps

  kpdecker

  committed
  8b1f184View commit details

  Copy full SHA for 8b1f184

  View code at this pointBrowse repository at this point

Commits on Aug 27, 2017

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

  

  tyomitch

  authored and

  kpdecker

  committed
  15fef93View commit details

  Copy full SHA for 15fef93

  View code at this pointBrowse repository at this point

Commits on Jul 6, 2017

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

  

  Artyom Skrobov

  authored and

  kpdecker

  committed
  d8a3635View commit details

  Copy full SHA for d8a3635

  View code at this pointBrowse repository at this point

Commits on Apr 17, 2017

• fix: some corrections re ignoreCase option

  Show description for 3c78fd0
  

  artemv

  authored and

  kpdecker

  committed
  3c78fd0View commit details

  Copy full SHA for 3c78fd0

  View code at this pointBrowse repository at this point

• Sanitize filename while parsing patches

  

  ramya-rao-a

  authored and

  kpdecker

  committed
  2fe8129View commit details

  Copy full SHA for 2fe8129

  View code at this pointBrowse repository at this point

Commits on Dec 22, 2016

• Add `undefinedReplacement` option to `diffJson`

  ewnd9

  committed
  d234b04View commit details

  Copy full SHA for d234b04

  View code at this pointBrowse repository at this point

Commits on Nov 27, 2016

• Merge pull request #144 from soulbeing/SpliteFile

  Show description for 7760e23
  kpdecker

  authored
  7760e23View commit details

  Copy full SHA for 7760e23

  View code at this pointBrowse repository at this point

Commits on Oct 20, 2016

• added JsDiff.diffArrays

  Show description for 0bb9c4c
  wvanderdeijl

  committed
  0bb9c4cView commit details

  Copy full SHA for 0bb9c4c

  View code at this pointBrowse repository at this point

Commits on Oct 12, 2016

• more changes

  Show description for b42b679
  soulbeing

  committed
  b42b679View commit details

  Copy full SHA for b42b679

  View code at this pointBrowse repository at this point

Commits on Sep 16, 2016

• Parse multiple files in the absence of the Index line to fix #135 issue.

  ramya-rao-a

  committed
  f4d1579View commit details

  Copy full SHA for f4d1579

  View code at this pointBrowse repository at this point

Commits on Aug 21, 2016

• Test to check errors on `applyPatches.complete`

  piranna

  committed
  66057e6View commit details

  Copy full SHA for 66057e6

  View code at this pointBrowse repository at this point

Commits on Aug 18, 2016

• Add callback argument to applyPatches `patched` option

  piranna

  committed
  c45c703View commit details

  Copy full SHA for c45c703

  View code at this pointBrowse repository at this point

Commits on Jun 22, 2016

• Fix failing tests under phantom

  kpdecker

  committed
  5d6617eView commit details

  Copy full SHA for 5d6617e

  View code at this pointBrowse repository at this point

• Avoid const overwrite

  kpdecker

  committed
  86a0ecfView commit details

  Copy full SHA for 86a0ecf

  View code at this pointBrowse repository at this point

Commits on Jun 8, 2016

• Additional let removal

  kpdecker

  committed
  926d2bdView commit details

  Copy full SHA for 926d2bd

  View code at this pointBrowse repository at this point

• Fix failing test under phantom

  kpdecker

  committed
  15ac48bView commit details

  Copy full SHA for 15ac48b

  View code at this pointBrowse repository at this point

Commits on Jun 7, 2016

• Correctly handle file names containing spaces

  ad-si

  committed
  d92e223View commit details

  Copy full SHA for d92e223

  View code at this pointBrowse repository at this point

Commits on May 31, 2016

• Add a fix for applying 0-length destination patches

  chaaz

  committed
  d20f367View commit details

  Copy full SHA for d20f367

  View code at this pointBrowse repository at this point

Commits on Mar 13, 2016

• Add test coverage for json diff missing values

  kpdecker

  committed
  1d7eef0View commit details

  Copy full SHA for 1d7eef0

  View code at this pointBrowse repository at this point

• Add toJSON support in diffJson

  Show description for 23163b2
  kpdecker

  committed
  23163b2View commit details

  Copy full SHA for 23163b2

  View code at this pointBrowse repository at this point

• Safely handle empty diffs with whitespace

  Show description for 40ad336
  kpdecker

  committed
  40ad336View commit details

  Copy full SHA for 40ad336

  View code at this pointBrowse repository at this point

• Update to babel 6

  kpdecker

  committed
  e48c7ddView commit details

  Copy full SHA for e48c7dd

  View code at this pointBrowse repository at this point

Commits on Feb 24, 2016

• Relax parser when no file header name is provided

  Show description for a8df4be
  kpdecker

  committed
  a8df4beView commit details

  Copy full SHA for a8df4be

  View code at this pointBrowse repository at this point

Commits on Nov 6, 2015

• Less restrictive regexp & 'should handle patches without Index' test

  piranna

  committed
  3ab1df8View commit details

  Copy full SHA for 3ab1df8

  View code at this pointBrowse repository at this point

Commits on Nov 5, 2015

• Fix lint on regexp

  piranna

  committed
  41e3e29View commit details

  Copy full SHA for 41e3e29

  View code at this pointBrowse repository at this point

Commits on Oct 29, 2015

• Split diffs based on file headers instead of 'Index:' metadata

  piranna

  committed
  acb20d3View commit details

  Copy full SHA for acb20d3

  View code at this pointBrowse repository at this point

Commits on Oct 26, 2015

• Split logic for fit candidates on an iterator

  piranna

  committed
  09b7efeView commit details

  Copy full SHA for 09b7efe

  View code at this pointBrowse repository at this point

Commits on Oct 21, 2015

• Test for hunk offsets

  piranna

  committed
  d723875View commit details

  Copy full SHA for d723875

  View code at this pointBrowse repository at this point

Commits on Sep 29, 2015

• add existing check at line 56 src/patch.js

  Show description for 35a761d
  

  Shi Wenzhe

  committed
  35a761dView commit details

  Copy full SHA for 35a761d

  View code at this pointBrowse repository at this point

Commits on Sep 24, 2015

• Ignore unexpected content outside of strict mode

  Show description for c73b432
  kpdecker

  committed
  c73b432View commit details

  Copy full SHA for c73b432

  View code at this pointBrowse repository at this point

Commits on Sep 9, 2015

• Export applyPatches from root module

  Show description for 4b6ae49
  kpdecker

  committed
  4b6ae49View commit details

  Copy full SHA for 4b6ae49

  View code at this pointBrowse repository at this point