0.0.4

Mr-Wallet · Mr-Wallet · commit cd8d7618bb15 · 2022-07-25T12:03:24.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,4 @@
+# CHANGELOG
+
+## 0.0.4
+Major improvements to memory usage.
diff --git a/diff3.js b/diff3.js
@@ -1,6 +1,6 @@
 // Copyright (c) 2006, 2008 Tony Garnock-Jones <tonyg@lshift.net>
 // Copyright (c) 2006, 2008 LShift Ltd. <query@lshift.net>
-// Copyright (c) 2016 Axosoft, LLC (www.axosoft.com)
+// Copyright (c) 2016, 2022 Axosoft, LLC (www.gitkraken.com)
 //
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation files
diff --git a/onp.js b/onp.js
@@ -2,7 +2,7 @@
  * URL: https://github.com/cubicdaiya/onp
  *
  * Copyright (c) 2013 Tatsuhiko Kubo <cubicdaiya@gmail.com>
- * Copyright (c) 2016 Axosoft, LLC (www.axosoft.com)
+ * Copyright (c) 2016, 2022 Axosoft, LLC (www.gitkraken.com)
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -134,7 +134,7 @@ module.exports = function (a_, b_) {
 
                 lastStartX = elem.startX;
                 lastStartY = elem.startY;
-                
+
                 r = pathposi[r].r;
             }
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "diff3",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "A diff3 engine for nodejs",
   "main": "diff3.js",
   "scripts": {
@@ -14,7 +14,7 @@
     "diff3",
     "diff"
   ],
-  "author": "Tyler Wanek",
+  "author": "Tyler Wanek & Jacob Watson",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/axosoft/diff3/issues"

-Original file line number
+Diff line change
@@ @@ -1,6 +1,6 @@ @@
 // Copyright (c) 2006, 2008 Tony Garnock-Jones <[email protected]>
 // Copyright (c) 2006, 2008 LShift Ltd. <[email protected]>
 -// Copyright (c) 2016 Axosoft, LLC (www.axosoft.com)
 +// Copyright (c) 2016, 2022 Axosoft, LLC (www.gitkraken.com)
 //
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation files
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`* URL: https://github.com/cubicdaiya/onp`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2013 Tatsuhiko Kubo <[email protected]>`
`5`		`- * Copyright (c) 2016 Axosoft, LLC (www.axosoft.com)`
	`5`	`+ * Copyright (c) 2016, 2022 Axosoft, LLC (www.gitkraken.com)`
`6`	`6`	`*`
`7`	`7`	`* Permission is hereby granted, free of charge, to any person obtaining a copy`
`8`	`8`	`* of this software and associated documentation files (the "Software"), to deal`
`@@ -134,7 +134,7 @@ module.exports = function (a_, b_) {`
`134`	`134`
`135`	`135`	`lastStartX = elem.startX;`
`136`	`136`	`lastStartY = elem.startY;`
`137`		`-`
	`137`	`+`
`138`	`138`	`r = pathposi[r].r;`
`139`	`139`	`}`
`140`	`140`