mhagger/git-imerge
1
1
Fork 0
mirror of https://github.com/mhagger/git-imerge.git synced 2024-08-17 11:00:29 +03:00
Code Issues Projects Releases Wiki Activity
563 Commits 5 Branches 4 Tags 1 MiB
master
Commit Graph

5 Commits

Author SHA1 Message Date
Michael Haggerty
7a2e5c314e MANIFEST.in: add t/test-really-conflicted 2020-09-19 16:40:25 +02:00
Michael Haggerty
44820da626 Test a scenario that involves backtracking but ultimately fails 2020-09-18 14:19:15 +02:00
Michael Haggerty
30ca20ff8f Add some tests involving duplicated commits 2020-09-18 14:19:15 +02:00
Michael Haggerty
cb0d20f76e tests: make each test script set up its own test repository 2020-09-18 14:19:15 +02:00
Jon Dufresne
1c14b8a22f Add setup.py script to build the package using setuptools 
Setuptools is a fully-featured, actively-maintained, and stable library
designed to facilitate packaging Python projects. It is the standard
library used to create Python packages by the community.

The setup.py script allows building an sdist package and a wheel
package. Installing the package with setuptools installs a gitimerge.py
module and a git-imerge command line script.

A tox configuration was added to automate testing in a virtualenv.

The README has been updated with new installation and testing instructions.
 2019-06-10 18:39:26 -07:00