Code

conflicts: whitespace parsing fixes#4944

Code

Merged

scott2000 merged 4 commits intojj-vcs:mainjj-vcs/jj:mainfrom scott2000:conflict-whitespace-fixesscott2000/jj:conflict-whitespace-fixesCopy head branch name to clipboardNov 23, 2024

+102-2

Commits

Commits on Nov 22, 2024

• conflicts: demo failed parse of markers with CRLF

  scott2000

  committed
  b0dee78

• conflicts: allow CRLF line endings on conflict markers

  Show description for f166399
  scott2000

  committed
  f166399

• conflicts: demo failed parse of diff with empty line

  scott2000

  committed
  8f71310

• conflicts: allow stripped trailing whitespace in diffs

  Show description for 196fbef
  scott2000

  committed
  196fbef