{ "info": { "author": "Breezy Developers", "author_email": "team@breezy-vcs.org", "bugtrack_url": null, "classifiers": [ "Development Status :: 4 - Beta", "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)", "Operating System :: POSIX", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy" ], "description": "A Python implementation of 3-way merge of texts.\n\nGiven BASE, OTHER, THIS, tries to produce a combined text\nincorporating the changes from both BASE->OTHER and BASE->THIS.\nAll three will typically be sequences of lines.\n\nUsage\n=====\n\nFrom the command-line::\n\n $ echo foo > mine\n $ echo bar > base\n $ echo blah > other\n $ python -m merge3 mine base other > merged\n $ cat merged\n\nOr from Python::\n\n >>> import merge3\n >>> m3 = merge3.Merge3(\n ... ['common\\n', 'base\\n'],\n ... ['common\\n', 'a\\n'],\n ... ['common\\n', 'b\\n'])\n >>> list(m3.merge_annotated())\n ['u | common\\n', '<<<<\\n', 'A | a\\n', '----\\n', 'B | b\\n', '>>>>\\n']\n", "description_content_type": "", "docs_url": null, "download_url": "", "downloads": { "last_day": -1, "last_month": -1, "last_week": -1 }, "home_page": "https://www.breezy-vcs.org/", "keywords": "", "license": "GNU GPLv2 or later", "maintainer": "", "maintainer_email": "", "name": "merge3", "package_url": "https://pypi.org/project/merge3/", "platform": "", "project_url": "https://pypi.org/project/merge3/", "project_urls": { "Homepage": "https://www.breezy-vcs.org/" }, "release_url": "https://pypi.org/project/merge3/0.0.2/", "requires_dist": null, "requires_python": "", "summary": "Python implementation of 3-way merge.", "version": "0.0.2" }, "last_serial": 5350573, "releases": { "0.0.1": [ { "comment_text": "", "digests": { "md5": "c9103afe839ec1ab60e2cc3f1ac31ef3", "sha256": "d3235b34beeca02cae6340c84efe308589bae472b6f72d4eaf879a3a21864b3c" }, "downloads": -1, "filename": "merge3-0.0.1.tar.gz", "has_sig": true, "md5_digest": "c9103afe839ec1ab60e2cc3f1ac31ef3", "packagetype": "sdist", "python_version": "source", "requires_python": null, "size": 8193, "upload_time": "2018-07-12T00:16:05", "url": "https://files.pythonhosted.org/packages/d4/d1/804a713c68d7c83e71c23318e52a0613ee3053e7fbe65f143e3de39bda13/merge3-0.0.1.tar.gz" } ], "0.0.2": [ { "comment_text": "", "digests": { "md5": "d5b14233bd3de5b93bb046272fa57c79", "sha256": "35f2d6a5ea45d6dc16afb577205e5dd131146f2f8aa446e34f4228eb09afc52f" }, "downloads": -1, "filename": "merge3-0.0.2.tar.gz", "has_sig": true, "md5_digest": "d5b14233bd3de5b93bb046272fa57c79", "packagetype": "sdist", "python_version": "source", "requires_python": null, "size": 8937, "upload_time": "2018-08-02T18:36:08", "url": "https://files.pythonhosted.org/packages/8b/5c/baef7edc9e570a48a82be3bcf92db86fe3d3dcbebe40ef1113e614149f58/merge3-0.0.2.tar.gz" } ] }, "urls": [ { "comment_text": "", "digests": { "md5": "d5b14233bd3de5b93bb046272fa57c79", "sha256": "35f2d6a5ea45d6dc16afb577205e5dd131146f2f8aa446e34f4228eb09afc52f" }, "downloads": -1, "filename": "merge3-0.0.2.tar.gz", "has_sig": true, "md5_digest": "d5b14233bd3de5b93bb046272fa57c79", "packagetype": "sdist", "python_version": "source", "requires_python": null, "size": 8937, "upload_time": "2018-08-02T18:36:08", "url": "https://files.pythonhosted.org/packages/8b/5c/baef7edc9e570a48a82be3bcf92db86fe3d3dcbebe40ef1113e614149f58/merge3-0.0.2.tar.gz" } ] }