FazBrowse GitHub Viewer | Trending | | Home

Tools: [Download Repo ZIP] [Original HTTPS Page]

Merge pull request #672 from nodegit/statusfile-isconflicted · 19h/nodegit@93d7e57 · GitHub

Repository navigation

Commit 93d7e57

committed

Merge pull request nodegit#672 from nodegit/statusfile-isconflicted

add statusFile.isConflicted

2 parents 0f73bf1 + fd21610 commit 93d7e57Copy full SHA for 93d7e57

1 file changed

lib
- status_file.js

‎lib/status_file.js‎

-Original file line number
+Diff line change
@@ @@ -81,7 +81,10 @@ var StatusFile = function(args) { @@
              status & codes.INDEX_RENAMED;
     },
     isIgnored: function() {
 -      return data.statusBit & codes.IGNORED;
 +      return status & codes.IGNORED;
 +    },
 +    isConflicted: function() {
 +      return status & codes.CONFLICTED;
     },
     inWorkingTree: function() {
       return status & codes.WT_NEW ||

Comments

(0)

Back | FazBrowse Home | New Git URL