git-resolve-conflict/package.json

Resolve git conflict in a given file, using given strategy (--ours, --theirs, --union)

{
  "name": "git-resolve-conflict",
  "version": "2.0.0",
  "description": "Resolve git conflict in a given file, using given strategy (--ours, --theirs, --union)",
  "author": "Jakub Gieryluk <jakub.g.opensource@gmail.com>",
  "license": "MIT",
  "repository": {
    "type": "git",
    "url": "https://github.com/jakub-g/git-resolve-conflict.git"
  },
  "bugs": {
    "url": "https://github.com/jakub-g/git-resolve-conflict/issues"
  },
  "bin": {
    "git-resolve-conflict": "./bin/git-resolve-conflict",
    "git-resolve-ours": "./bin/git-resolve-ours",
    "git-resolve-theirs": "./bin/git-resolve-theirs",
    "git-resolve-union": "./bin/git-resolve-union"
  },
  "keywords": [
    "git",
    "conflict",
    "merge"
  ]
}