ihgs / yaml2gantt

MIT License
10 stars 1 forks source link

An in-range update of simple-git is breaking the build 🚨 #37

Open greenkeeper[bot] opened 6 years ago

greenkeeper[bot] commented 6 years ago

Version 1.95.0 of simple-git was just published.

Branch Build failing 🚨
Dependency simple-git
Current Version 1.94.0
Type dependency

This version is covered by your current version range and after updating it in your project the build failed.

simple-git is a direct dependency of this project, and it is very likely causing it to break. If other packages depend on yours, this update is probably also breaking those in turn.

Status Details - ❌ **ci/circleci** Your tests failed on CircleCI [Details](https://circleci.com/gh/ihgs/yaml2gantt/197?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link)

Commits

The new version differs by 11 commits.

See the full diff

FAQ and help There is a collection of [frequently asked questions](https://greenkeeper.io/faq.html). If those don’t help, you can always [ask the humans behind Greenkeeper](https://github.com/greenkeeperio/greenkeeper/issues/new).

Your Greenkeeper Bot :palm_tree:

greenkeeper[bot] commented 6 years ago

After pinning to 1.94.0 your tests are passing again. Downgrade this dependency πŸ“Œ.

greenkeeper[bot] commented 6 years ago

Version 1.95.1 just got published.

Your tests are passing again with this version. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 4 commits.

See the full diff

greenkeeper[bot] commented 6 years ago

Version 1.96.0 just got published.

Your tests are passing again with this version. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 10 commits.

See the full diff

greenkeeper[bot] commented 5 years ago

Your tests are passing again with this update. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 16 commits.

There are 16 commits in total.

See the full diff

greenkeeper[bot] commented 5 years ago

Your tests are passing again with this update. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 27 commits.

  • 7f0d520 1.99.0
  • 863522d Merge branch 'pull-summary'
  • 0e2b918 Update travis
  • 3e82e79 ...
  • bd1a495 Merge remote-tracking branch 'origin/master' into pull-summary
  • 8f1ed2d Remove package-lock
  • 4dd50f2 Upgrade all dependencies, export typescript interfaces, switch to yarn
  • 58fea7d Release 1.98.0
  • 1054336 Update to include created/deleted in the pull summary
  • 2717a92 Merge branch 'master' of https://github.com/brilvio/git-js into brilvio-master
  • f9ff9cb Merge pull request #303 from steveukx/300_fix-stash-list
  • b4b5b60 Change default splitter in stashList to several semi-colons to avoid occasional use of ; in the commit message.
  • e88eef2 Changed to expect or not a space in the eol
  • bbab36e Fixed only getting summary for changes on files
  • 144322b Release 1.97.0

There are 27 commits in total.

See the full diff

greenkeeper[bot] commented 5 years ago

Your tests are passing again with this update. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 30 commits.

  • 85f8814 1.100.0
  • 4712735 Include promise.js in published output
  • 35cab3e Publish on version change
  • 7f0d520 1.99.0
  • 863522d Merge branch 'pull-summary'
  • 0e2b918 Update travis
  • 3e82e79 ...
  • bd1a495 Merge remote-tracking branch 'origin/master' into pull-summary
  • 8f1ed2d Remove package-lock
  • 4dd50f2 Upgrade all dependencies, export typescript interfaces, switch to yarn
  • 58fea7d Release 1.98.0
  • 1054336 Update to include created/deleted in the pull summary
  • 2717a92 Merge branch 'master' of https://github.com/brilvio/git-js into brilvio-master
  • f9ff9cb Merge pull request #303 from steveukx/300_fix-stash-list
  • b4b5b60 Change default splitter in stashList to several semi-colons to avoid occasional use of ; in the commit message.

There are 30 commits in total.

See the full diff

greenkeeper[bot] commented 5 years ago

Your tests are passing again with this update. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 37 commits.

There are 37 commits in total.

See the full diff

greenkeeper[bot] commented 5 years ago

Your tests are passing again with this update. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 39 commits.

There are 39 commits in total.

See the full diff

greenkeeper[bot] commented 5 years ago

Your tests are passing again with this update. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 42 commits.

There are 42 commits in total.

See the full diff

greenkeeper[bot] commented 5 years ago

Your tests are passing again with this update. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 44 commits.

There are 44 commits in total.

See the full diff

greenkeeper[bot] commented 5 years ago

Your tests are passing again with this update. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 48 commits.

  • ef368c8 1.105.0
  • 8469ac7 Merge branch 'integration-test-concurrent-commands'
  • 361133d Add delay between first close/exit event where no content has yet been received
  • 103e507 Add integration test for concurrent command handling - references #317
  • c8ac5bf 1.104.0
  • 9ca468d Add german locale test for checkIsRepo.
  • 90a3c37 1.103.0
  • 2aab2c1 Merge branch 'ffflorian-patch-1'
  • 990b2ad Remove default value
  • 64f7502 1.102.0
  • e63d24a Include promise.d.ts
  • 910e3bc 1.101.0
  • ffb7d26 Add example for importing the simple-git/promise in TypeScript
  • 6e59ee7 Add promise.d.ts to top level to allow for using import simplegit from 'simple-git/promise' in typescript
  • ec4e587 Stop ignoring typescript's d.ts files

There are 48 commits in total.

See the full diff

greenkeeper[bot] commented 5 years ago

Your tests are passing again with this update. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 50 commits.

  • e202439 1.106.0
  • 6d3151d Ensure verbose output in all git branch commands.
  • ef368c8 1.105.0
  • 8469ac7 Merge branch 'integration-test-concurrent-commands'
  • 361133d Add delay between first close/exit event where no content has yet been received
  • 103e507 Add integration test for concurrent command handling - references #317
  • c8ac5bf 1.104.0
  • 9ca468d Add german locale test for checkIsRepo.
  • 90a3c37 1.103.0
  • 2aab2c1 Merge branch 'ffflorian-patch-1'
  • 990b2ad Remove default value
  • 64f7502 1.102.0
  • e63d24a Include promise.d.ts
  • 910e3bc 1.101.0
  • ffb7d26 Add example for importing the simple-git/promise in TypeScript

There are 50 commits in total.

See the full diff

greenkeeper[bot] commented 5 years ago

Your tests are passing again with this update. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 52 commits.

  • e1716dd v1.107.0
  • 0e83098 Add test showing amend option in commit
  • e202439 1.106.0
  • 6d3151d Ensure verbose output in all git branch commands.
  • ef368c8 1.105.0
  • 8469ac7 Merge branch 'integration-test-concurrent-commands'
  • 361133d Add delay between first close/exit event where no content has yet been received
  • 103e507 Add integration test for concurrent command handling - references #317
  • c8ac5bf 1.104.0
  • 9ca468d Add german locale test for checkIsRepo.
  • 90a3c37 1.103.0
  • 2aab2c1 Merge branch 'ffflorian-patch-1'
  • 990b2ad Remove default value
  • 64f7502 1.102.0
  • e63d24a Include promise.d.ts

There are 52 commits in total.

See the full diff

greenkeeper[bot] commented 5 years ago

Your tests are passing again with this update. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 57 commits.

  • 1787912 1.108.0
  • 167e909 Remove .npmignore - publishing uses the package.json files array instead
  • f3f1032 Merge branch 'tvongeldern-master'
  • 6dac0c6 Switch to utility function in place of constant
  • 076064e Use absolute paths for module dependencies
  • e1716dd v1.107.0
  • 0e83098 Add test showing amend option in commit
  • e202439 1.106.0
  • 6d3151d Ensure verbose output in all git branch commands.
  • ef368c8 1.105.0
  • 8469ac7 Merge branch 'integration-test-concurrent-commands'
  • 361133d Add delay between first close/exit event where no content has yet been received
  • 103e507 Add integration test for concurrent command handling - references #317
  • c8ac5bf 1.104.0
  • 9ca468d Add german locale test for checkIsRepo.

There are 57 commits in total.

See the full diff

greenkeeper[bot] commented 5 years ago

Your tests are passing again with this update. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 63 commits.

  • 21cf165 1.109.0
  • f3baf9d Merge branch 'RobertAKARobin-feature/no-refs-in-log'
  • fb611d5 Update typescript definitions
  • 7381cba Reintroduce the branch detail as another field in the default log format
  • 686f728 Merge branch 'feature/no-refs-in-log' of https://github.com/RobertAKARobin/git-js into RobertAKARobin-feature/no-refs-in-log
  • 1787912 1.108.0
  • 167e909 Remove .npmignore - publishing uses the package.json files array instead
  • f3f1032 Merge branch 'tvongeldern-master'
  • 6dac0c6 Switch to utility function in place of constant
  • 076064e Use absolute paths for module dependencies
  • 3fe81ad Removed refs/%d from git log; fixes #297
  • e1716dd v1.107.0
  • 0e83098 Add test showing amend option in commit
  • e202439 1.106.0
  • 6d3151d Ensure verbose output in all git branch commands.

There are 63 commits in total.

See the full diff

greenkeeper[bot] commented 5 years ago

Your tests are passing again with this update. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 70 commits.

  • d8dd36d 1.110.0
  • 663b153 Merge branch 'pr/333'
  • a1e037b Adds test, update the definition file and add a note to the readme
  • f1db07b Merge branch 'master' into pr/333
  • 8a5278c Change name of the %d placeholder torefs
  • e613462 Change name of the %d placeholder torefs
  • 21cf165 1.109.0
  • f3baf9d Merge branch 'RobertAKARobin-feature/no-refs-in-log'
  • fb611d5 Update typescript definitions
  • 7381cba Reintroduce the branch detail as another field in the default log format
  • 686f728 Merge branch 'feature/no-refs-in-log' of https://github.com/RobertAKARobin/git-js into RobertAKARobin-feature/no-refs-in-log
  • 1787912 1.108.0
  • 167e909 Remove .npmignore - publishing uses the package.json files array instead
  • f3f1032 Merge branch 'tvongeldern-master'
  • 6dac0c6 Switch to utility function in place of constant

There are 70 commits in total.

See the full diff

greenkeeper[bot] commented 5 years ago

Your tests are still failing with this version. Compare changes

Commits

The new version differs by 77 commits.

  • cf6c9db 1.111.0
  • 8a49ff2 Trim the result of git.revparse
  • 1ce804b Merge remote-tracking branch 'origin/master'
  • 6e513db Ignore the mac .DS_Store
  • d8b15b9 Add unit tests showing the inclusion of additional command line arguments for git log
  • 7ef11d7 Merge pull request #346 from steveukx/Issue-345
  • 03aa287 Add integration test for checkIsRepo
  • d8dd36d 1.110.0
  • 663b153 Merge branch 'pr/333'
  • a1e037b Adds test, update the definition file and add a note to the readme
  • f1db07b Merge branch 'master' into pr/333
  • 8a5278c Change name of the %d placeholder torefs
  • e613462 Change name of the %d placeholder torefs
  • 21cf165 1.109.0
  • f3baf9d Merge branch 'RobertAKARobin-feature/no-refs-in-log'

There are 77 commits in total.

See the full diff

greenkeeper[bot] commented 5 years ago

Your tests are still failing with this version. Compare changes

Commits

The new version differs by 2 commits.

  • b6d4d15 1.112.0
  • 3513dce Add tests to cover the instantiation of the promise wrapped library with an invalid root folder.

See the full diff

greenkeeper[bot] commented 5 years ago

Your tests are still failing with this version. Compare changes

Commits

The new version differs by 8 commits.

  • 11fe5e8 1.113.0
  • 4e98280 Merge branch 'Guobacai-issue/286-git-log-add-non-symmetric-revision-range'
  • 4ca1002 Fix typo in readme for git.log
  • 76f4642 Add symmetric property to type definitions and simplify logic in git.log.
  • dee699a Merge branch 'issue/286-git-log-add-non-symmetric-revision-range' of https://github.com/Guobacai/git-js into Guobacai-issue/286-git-log-add-non-symmetric-revision-range
  • dc9251a Issue #286: Add "two dot" notation for "git log".
  • b95149e Add test for including quotes around a complex ref in git.fetch
  • ec7646d Issue #286: Add "two dot" notation for "git log".

See the full diff

greenkeeper[bot] commented 5 years ago

Your tests are still failing with this version. Compare changes

Commits

The new version differs by 2 commits.

  • d521ccb 1.114.0
  • e8717b3 add windowsHide: true option when spawning child process

See the full diff

greenkeeper[bot] commented 5 years ago

Your tests are still failing with this version. Compare changes

Commits

The new version differs by 3 commits.

See the full diff

greenkeeper[bot] commented 5 years ago

Your tests are still failing with this version. Compare changes

Commits

The new version differs by 2 commits.

See the full diff

greenkeeper[bot] commented 5 years ago

Your tests are still failing with this version. Compare changes

Commits

The new version differs by 4 commits.

See the full diff

greenkeeper[bot] commented 5 years ago

Your tests are still failing with this version. Compare changes

Commits

The new version differs by 4 commits.

  • fb57f67 1.118.0
  • 126ff98 Merge branch '357-eager-loading'
  • 9f39110 Switch lazy-loading to eager-loading of responses to allow for webpack bundling prior to the 2.x TS rewrite
  • b0fd6ad Add tests for supporting git rev-parse --show-toplevel in gitP (references #370)

See the full diff

greenkeeper[bot] commented 5 years ago

Your tests are still failing with this version. Compare changes

Commits

The new version differs by 7 commits.

  • 55434c5 1.119.0
  • aeef792 Merge branch 'pr-299_multi-line-format'
  • 1d02a6c Add support for multi-line commit messages in the git.log options:
  • 1094a1a Rename context util - naming clash in future #356
  • 2ce99fc Merge pull request #374 from steveukx/issue-366_add_all
  • 3c312e9 Fix use of assert
  • 6c6ed5b Adds integration test for adding files

See the full diff

greenkeeper[bot] commented 5 years ago

Your tests are still failing with this version. Compare changes

Commits

The new version differs by 9 commits.

  • 4ecd134 1.121.0
  • 1e4bf39 Merge branch 'dependencies'
  • d2934ee Update dependencies to remove fully deprecated (and now vulnerable) nodeunit while the v2 rewrite is in progress
  • 03ba754 1.120.0
  • 5048459 Merge branch 'multi-line-log-integration'
  • b66b979 Merge branch 'run-tests-in-node-10'
  • e9e7504 Note for using a custom splitter in git.log
  • 5342620 Add node version 10 to travis config, switch new Buffer to Buffer.from
  • 68021f7 Add integration test for multi-line comments in a log summary

See the full diff

greenkeeper[bot] commented 5 years ago

Your tests are passing again with this update. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 7 commits.

  • 662aea8 1.122.0
  • 3cb8ef3 Merge branch 'pr/383'
  • f6f907b White space
  • cccd7d0 Update type definitions
  • a8aa7ae Typo in import
  • 2515bb5 Add a line prefix to the format used in a --pretty argument used in both the git.log or git.stashList methods
  • 5806c0c Exposes issue #382

See the full diff

greenkeeper[bot] commented 4 years ago

Your tests are passing again with this update. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 10 commits.

  • da48a43 1.123.0
  • 2e641d7 Merge branch 'diff-changed'
  • b2484d9 Read the file(s) changed section of the diff summary line to be used as DiffSummary#changed
  • 662aea8 1.122.0
  • 3cb8ef3 Merge branch 'pr/383'
  • f6f907b White space
  • cccd7d0 Update type definitions
  • a8aa7ae Typo in import
  • 2515bb5 Add a line prefix to the format used in a --pretty argument used in both the git.log or git.stashList methods
  • 5806c0c Exposes issue #382

See the full diff

greenkeeper[bot] commented 4 years ago

Your tests are passing again with this update. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 15 commits.

  • 6237289 1.124.0
  • 9248333 Merge branch 'luqimin-patch-1'
  • cbb6fb8 TypeScript definitions - clone can also accept an Options object in place of the string array
  • 19eb7b2 Merge branch 'patch-1' of https://github.com/luqimin/git-js into luqimin-patch-1
  • da48a43 1.123.0
  • 2e641d7 Merge branch 'diff-changed'
  • b2484d9 Read the file(s) changed section of the diff summary line to be used as DiffSummary#changed
  • 662aea8 1.122.0
  • 3cb8ef3 Merge branch 'pr/383'
  • f6f907b White space
  • cccd7d0 Update type definitions
  • a8aa7ae Typo in import
  • 2515bb5 Add a line prefix to the format used in a --pretty argument used in both the git.log or git.stashList methods
  • 5806c0c Exposes issue #382
  • 4d34e56 Fix typings error for git.clone() params

See the full diff

greenkeeper[bot] commented 4 years ago

Your tests are passing again with this update. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 20 commits.

  • 12bfcf7 1.125.0
  • 6c2dd20 Merge branch 'pr/358'
  • 11cf22f Add test for git.tag and update method to support usage documented in type definitions
  • c67ae6e Merge remote-tracking branch 'origin/master' into pr/358
  • 6237289 1.124.0
  • 9248333 Merge branch 'luqimin-patch-1'
  • cbb6fb8 TypeScript definitions - clone can also accept an Options object in place of the string array
  • 19eb7b2 Merge branch 'patch-1' of https://github.com/luqimin/git-js into luqimin-patch-1
  • da48a43 1.123.0
  • 2e641d7 Merge branch 'diff-changed'
  • b2484d9 Read the file(s) changed section of the diff summary line to be used as DiffSummary#changed
  • 662aea8 1.122.0
  • 3cb8ef3 Merge branch 'pr/383'
  • f6f907b White space
  • cccd7d0 Update type definitions

There are 20 commits in total.

See the full diff

greenkeeper[bot] commented 4 years ago

Your tests are passing again with this update. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 23 commits.

  • 031ace1 1.126.0
  • a925e31 Merge branch 'issue-389'
  • ff7c104 Force --follow to be appended to the set of supplied options in a git.log
  • 12bfcf7 1.125.0
  • 6c2dd20 Merge branch 'pr/358'
  • 11cf22f Add test for git.tag and update method to support usage documented in type definitions
  • c67ae6e Merge remote-tracking branch 'origin/master' into pr/358
  • 6237289 1.124.0
  • 9248333 Merge branch 'luqimin-patch-1'
  • cbb6fb8 TypeScript definitions - clone can also accept an Options object in place of the string array
  • 19eb7b2 Merge branch 'patch-1' of https://github.com/luqimin/git-js into luqimin-patch-1
  • da48a43 1.123.0
  • 2e641d7 Merge branch 'diff-changed'
  • b2484d9 Read the file(s) changed section of the diff summary line to be used as DiffSummary#changed
  • 662aea8 1.122.0

There are 23 commits in total.

See the full diff

greenkeeper[bot] commented 4 years ago

Your tests are passing again with this update. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 27 commits.

  • cbf6396 1.127.0
  • 12d47f8 Update error message for .then to recommend switching to simple-git/promise
  • 8654f14 Merge remote-tracking branch 'origin/master'
  • 031ace1 1.126.0
  • a925e31 Merge branch 'issue-389'
  • ff7c104 Force --follow to be appended to the set of supplied options in a git.log
  • 12bfcf7 1.125.0
  • 6c2dd20 Merge branch 'pr/358'
  • 11cf22f Add test for git.tag and update method to support usage documented in type definitions
  • c67ae6e Merge remote-tracking branch 'origin/master' into pr/358
  • 6237289 1.124.0
  • 9248333 Merge branch 'luqimin-patch-1'
  • cbb6fb8 TypeScript definitions - clone can also accept an Options object in place of the string array
  • 19eb7b2 Merge branch 'patch-1' of https://github.com/luqimin/git-js into luqimin-patch-1
  • da48a43 1.123.0

There are 27 commits in total.

See the full diff

greenkeeper[bot] commented 4 years ago

Your tests are passing again with this update. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 32 commits.

  • 3179483 1.128.0
  • d6a41c4 Merge pull request #405 from DanielRuf/docs/use-https
  • b39552f Merge pull request #408 from PMudra/patch-1
  • cbf6396 1.127.0
  • 12d47f8 Update error message for .then to recommend switching to simple-git/promise
  • 8654f14 Merge remote-tracking branch 'origin/master'
  • bf249ac Correct BranchSummary declaration
  • 6f503f2 Use https
  • 031ace1 1.126.0
  • a925e31 Merge branch 'issue-389'
  • ff7c104 Force --follow to be appended to the set of supplied options in a git.log
  • 12bfcf7 1.125.0
  • 6c2dd20 Merge branch 'pr/358'
  • 11cf22f Add test for git.tag and update method to support usage documented in type definitions
  • c67ae6e Merge remote-tracking branch 'origin/master' into pr/358

There are 32 commits in total.

See the full diff

greenkeeper[bot] commented 4 years ago

Your tests are passing again with this update. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 35 commits.

  • c90dfa9 1.129.0
  • 4c614c2 Add documentation for promise with exception
  • 52fc513 Include git property in promise wrapped exceptions
  • 3179483 1.128.0
  • d6a41c4 Merge pull request #405 from DanielRuf/docs/use-https
  • b39552f Merge pull request #408 from PMudra/patch-1
  • cbf6396 1.127.0
  • 12d47f8 Update error message for .then to recommend switching to simple-git/promise
  • 8654f14 Merge remote-tracking branch 'origin/master'
  • bf249ac Correct BranchSummary declaration
  • 6f503f2 Use https
  • 031ace1 1.126.0
  • a925e31 Merge branch 'issue-389'
  • ff7c104 Force --follow to be appended to the set of supplied options in a git.log
  • 12bfcf7 1.125.0

There are 35 commits in total.

See the full diff

greenkeeper[bot] commented 4 years ago

Your tests are passing again with this update. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 50 commits.

  • dbba54b 1.131.0
  • e935f02 Merge branch 'new-tag-bug'
  • a340007 Only pass callback through from addTag to tag when present, to allow for creating named tags without a callback.
  • 7b65570 1.130.0
  • c226518 Merge branch 'pr-test/420'
  • 30ec6b2 Add integration test for conflicted statuses
  • 5c68bf1 Add comments to file status types
  • 93dcb5f Mark modify/delete merge conflicts correctly in status summary
  • 7f715b8 Add MergeSummary types
  • ce5f6f9 Parse modify/delete merge conflicts properly
  • fa3c6c5 Merge pull request #417 from janmariu/master
  • 6465b2f Adding files with merge status AA to StatusSummary.conflicted
  • 6abaf22 Added failing test for AA merge status
  • 08eb079 Merge pull request #415 from steveukx/399-renamed-files-in-status-summary
  • 1095f92 Add unit tests covering the inclusion of renamed files in the StatusSummary response

There are 50 commits in total.

See the full diff

greenkeeper[bot] commented 4 years ago

Your tests are passing again with this update. Explicitly upgrade to this version πŸš€

Commits

The new version differs by 54 commits.

  • 0453266 1.132.0
  • ff390ae Set options as optional in git.branch typing
  • 49eb9cd Fix typo in TypeScript example in readme
  • 70c658e Update TypeScript import example in readme
  • dbba54b 1.131.0
  • e935f02 Merge branch 'new-tag-bug'
  • a340007 Only pass callback through from addTag to tag when present, to allow for creating named tags without a callback.
  • 7b65570 1.130.0
  • c226518 Merge branch 'pr-test/420'
  • 30ec6b2 Add integration test for conflicted statuses
  • 5c68bf1 Add comments to file status types
  • 93dcb5f Mark modify/delete merge conflicts correctly in status summary
  • 7f715b8 Add MergeSummary types
  • ce5f6f9 Parse modify/delete merge conflicts properly
  • fa3c6c5 Merge pull request #417 from janmariu/master

There are 54 commits in total.

See the full diff