Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kpdecker/jsdiff
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.2.2
Choose a base ref
...
head repository: kpdecker/jsdiff
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.3.0
Choose a head ref
  • 7 commits
  • 7 files changed
  • 2 contributors

Commits on Feb 9, 2015

  1. Adding Diff Trimmed Lines

    I extended the LineDiff.tokenize function to add the ability to ignore
    leading and trailing spaces when using TrimmedLineDiff, and added
    diffTrimmedLines to the public-facing functions. My changes should not
    affect any previous functionality.
    James Gould committed Feb 9, 2015
    Configuration menu
    Copy the full SHA
    3ac9cb4 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2015

  1. Documentation and tests for TrimmedLineDiff

    Refactoring to avoid changing tokenize API, adding documentation to
    README.md, and adding 4 tests for TrimmedLineDiff to diffTest.js.
    
    I also found a bug in how TrimmedLineDiff handled windows new lines
    while adding the test, as well as changed TrimmedLineDiff so it doesn't
    add a newline character ('\n') if it is the last line.
    James Gould committed Feb 11, 2015
    Configuration menu
    Copy the full SHA
    1892d77 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2015

  1. Fixing windows new line merge and readme

    I updated the Readme with the Function rather than the Object name.
    
    In the windows new line merge, I added a check for '\n', as well as
    added a comment. The reason I've extended the windows new line merge
    functionality is to handle any situations where '\n\n' may come up. We
    want '\r\n' instead.
    James Gould committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    b8cd87f View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2015

  1. Style, nitpick, and word choice

    Fixing everything discussed in the pull request. Also noticed the
    comment for the Trimmed Line Diff tests just said Line Diff, and fixed
    if ( style lower in diff.js
    James Gould committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    cb0c827 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2015

  1. Merge pull request #47 from JamesGould123/master

    Adding Diff Trimmed Lines
    kpdecker committed Mar 1, 2015
    Configuration menu
    Copy the full SHA
    a129da8 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2015

  1. Update release notes

    kpdecker committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    e83af50 View commit details
    Browse the repository at this point in the history
  2. v1.3.0

    kpdecker committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    b7f143c View commit details
    Browse the repository at this point in the history
Loading