simple-git - npm Package Compare versions

Comparing version 1.17.0 to 1.18.0

package.json

 {
   "name": "simple-git",
   "description": "Simple GIT interface for node.js",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "author": "Steve King <[e-mail]>",
@@ -6,0 +6,0 @@ "contributors": [

src/git.js

@@ -757,2 +757,3 @@ (function () {
       var created = [];
+      var conflicted = [];
 
@@ -778,2 +779,5 @@ var whitespace = /\s+/;
                break;
+            case "UU":
+               conflicted.push(line.join());
+               break;
          }
@@ -786,3 +790,4 @@ }
          modified: modified,
-         created: created
+         created: created,
+         conflicted: conflicted
       };
@@ -789,0 +794,0 @@ };

test/testCommands.js

@@ -434,2 +434,3 @@
             test.equals(0, status.not_added,    'No untracked files');
+            test.equals(0, status.conflicted,   'No conflicted files');
             test.done();
@@ -448,2 +449,3 @@ });
             test.equals(1, status.not_added.length,    'No un-tracked files');
+            test.equals(1, status.conflicted.length,   'No conflicted files');
             test.done();
@@ -459,2 +461,3 @@ });
         ?? test/ \n\
+        UU test.js\n\
         ');
@@ -461,0 +464,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

54680

increased by0.59%

Lines of code

1306

increased by0.62%

No dependency changes