This is an archived project. Repository and other project resources are read-only.

merge-conflict.bats

7 years ago

nimrod authored 7 years ago

- Fix issue when diff is empty.
- Forgot --stdout in patch generation.
- Fix issue when it's the same branch.

511ff06e

nimrod authored 7 years ago

- Fix issue when diff is empty.
- Forgot --stdout in patch generation.
- Fix issue when it's the same branch.