Joseph Frazier 027b41da59 Add git_merge_unrelated rule for git merge --allow-unrelated-histories (#773) ...

From https://git-scm.com/docs/merge-options#merge-options---allow-unrelated-histories

> By default, `git merge` command refuses to merge histories that do not
share a common ancestor. This option can be used to override this safety
when merging histories of two projects that started their lives
independently.

2018-01-16 20:03:56 -05:00

..

entrypoints

#682: Ensure that script exists

2017-09-03 10:10:50 +02:00

functional

#682: Fix functional tests for experimental instant mode

2017-10-08 17:16:15 +02:00

rules

Add git_merge_unrelated rule for git merge --allow-unrelated-histories (#773)

2018-01-16 20:03:56 -05:00

shells

Fix fish shell aliasing (#753)

2018-01-02 23:14:02 -05:00

specific

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

__init__.py

Fix tests with python 2

2015-04-25 03:13:57 +02:00

conftest.py

#682: Ensure that script exists

2017-09-03 10:10:50 +02:00

test_argument_parser.py

#682: Use our own shell logger, fix experimental instant mode on macos

2017-10-08 16:17:41 +02:00

test_conf.py

#N/A: Reset environment variables in tests

2017-08-03 12:18:05 +02:00

test_corrector.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_logs.py

Fix some more warnings from flake8

2015-11-15 18:08:59 +01:00

test_readme.py

Minor refactoring

2015-09-08 15:24:49 +03:00

test_types.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

test_ui.py

#682: Fix tests and flake8

2017-08-26 06:16:51 +02:00

test_utils.py

#707: Update tests

2017-10-10 08:31:45 +02:00

utils.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00