{"info":{"author":null,"author_email":null,"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 :: 3.10","Programming Language :: Python :: 3.11","Programming Language :: Python :: 3.12","Programming Language :: Python :: 3.8","Programming Language :: Python :: 3.9","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":"text/x-rst","docs_url":null,"download_url":null,"downloads":{"last_day":-1,"last_month":-1,"last_week":-1},"dynamic":null,"home_page":null,"keywords":null,"license":"GNU GPLv2 or later","maintainer":null,"maintainer_email":"Breezy Developers <team@breezy-vcs.org>","name":"merge3","package_url":"https://pypi.org/project/merge3/","platform":null,"project_url":"https://pypi.org/project/merge3/","project_urls":{"GitHub":"https://github.com/breezy-team/merge3","Homepage":"https://www.breezy-vcs.org/"},"provides_extra":null,"release_url":"https://pypi.org/project/merge3/0.0.15/","requires_dist":["ruff==0.4.3; extra == \"dev\""],"requires_python":">=3.8","summary":"Python implementation of 3-way merge","version":"0.0.15","yanked":false,"yanked_reason":null},"last_serial":23067049,"releases":{"0.0.1":[{"comment_text":"","digests":{"blake2b_256":"d4d1804a713c68d7c83e71c23318e52a0613ee3053e7fbe65f143e3de39bda13","md5":"c9103afe839ec1ab60e2cc3f1ac31ef3","sha256":"d3235b34beeca02cae6340c84efe308589bae472b6f72d4eaf879a3a21864b3c"},"downloads":-1,"filename":"merge3-0.0.1.tar.gz","has_sig":false,"md5_digest":"c9103afe839ec1ab60e2cc3f1ac31ef3","packagetype":"sdist","python_version":"source","requires_python":null,"size":8193,"upload_time":"2018-07-12T00:16:05","upload_time_iso_8601":"2018-07-12T00:16:05.950804Z","url":"https://files.pythonhosted.org/packages/d4/d1/804a713c68d7c83e71c23318e52a0613ee3053e7fbe65f143e3de39bda13/merge3-0.0.1.tar.gz","yanked":false,"yanked_reason":null}],"0.0.10":[{"comment_text":"","digests":{"blake2b_256":"650d529f846cbb2b257404c6d371c1ab5d8925c83b3ceb80efdfdbe5b1a05391","md5":"2e6f88710525d2db6c3f839a489eba74","sha256":"a6b25ae1d1b05b3325242360ced4d5a266de09e2cb2527f9a6dbeb17291bdfe7"},"downloads":-1,"filename":"merge3-0.0.10-py3-none-any.whl","has_sig":false,"md5_digest":"2e6f88710525d2db6c3f839a489eba74","packagetype":"bdist_wheel","python_version":"py3","requires_python":null,"size":17873,"upload_time":"2022-10-20T21:52:20","upload_time_iso_8601":"2022-10-20T21:52:20.742331Z","url":"https://files.pythonhosted.org/packages/65/0d/529f846cbb2b257404c6d371c1ab5d8925c83b3ceb80efdfdbe5b1a05391/merge3-0.0.10-py3-none-any.whl","yanked":false,"yanked_reason":null},{"comment_text":"","digests":{"blake2b_256":"dda5d31be0033a9a7164282a5be0e00f66441a4e9f5fe222735b48d3fd431adf","md5":"3a1cae17cf54ac2a161e244c5da226e5","sha256":"841c688fc0b4054e30f6672a7af5acc9686d2b9875f9abd3954a14b590e4f626"},"downloads":-1,"filename":"merge3-0.0.10.tar.gz","has_sig":false,"md5_digest":"3a1cae17cf54ac2a161e244c5da226e5","packagetype":"sdist","python_version":"source","requires_python":null,"size":17387,"upload_time":"2022-10-20T21:52:23","upload_time_iso_8601":"2022-10-20T21:52:23.363088Z","url":"https://files.pythonhosted.org/packages/dd/a5/d31be0033a9a7164282a5be0e00f66441a4e9f5fe222735b48d3fd431adf/merge3-0.0.10.tar.gz","yanked":false,"yanked_reason":null}],"0.0.11":[{"comment_text":"","digests":{"blake2b_256":"402863ad6466eb4f0237476f822479567dfae0ccd512cb0d128d471fd6e48774","md5":"706b507d120b71f10c1839f45f4f40a7","sha256":"ef82fd95aeac124ea9a1616a6e2ef9368bc4ed0ba3cce5f21323ee9028d86206"},"downloads":-1,"filename":"merge3-0.0.11-py3-none-any.whl","has_sig":false,"md5_digest":"706b507d120b71f10c1839f45f4f40a7","packagetype":"bdist_wheel","python_version":"py3","requires_python":null,"size":17875,"upload_time":"2022-10-28T00:04:16","upload_time_iso_8601":"2022-10-28T00:04:16.219195Z","url":"https://files.pythonhosted.org/packages/40/28/63ad6466eb4f0237476f822479567dfae0ccd512cb0d128d471fd6e48774/merge3-0.0.11-py3-none-any.whl","yanked":false,"yanked_reason":null},{"comment_text":"","digests":{"blake2b_256":"1bef6543392d9dcca7694c9c9bff93562107c3a3c104165f98348de41a080cd3","md5":"ee9a2b9054b3123d6a783fc94f388ee6","sha256":"859ee1c31595c148f0961c55402779bc98c1c63dfdfca2f2cd7d443be6f0ab9c"},"downloads":-1,"filename":"merge3-0.0.11.tar.gz","has_sig":false,"md5_digest":"ee9a2b9054b3123d6a783fc94f388ee6","packagetype":"sdist","python_version":"source","requires_python":null,"size":16511,"upload_time":"2022-10-28T00:04:18","upload_time_iso_8601":"2022-10-28T00:04:18.241920Z","url":"https://files.pythonhosted.org/packages/1b/ef/6543392d9dcca7694c9c9bff93562107c3a3c104165f98348de41a080cd3/merge3-0.0.11.tar.gz","yanked":false,"yanked_reason":null}],"0.0.12":[{"comment_text":"","digests":{"blake2b_256":"125627d09d7bcc9222522f71aac3b0b1696132af4a11f9e0cdccd53bb32b6bfe","md5":"8ced7a7d8feff0235e3f58b51af24a0e","sha256":"ae65e506488778a046af040e424ceb041d0cee4b493c2ef2daac852cc92a8b84"},"downloads":-1,"filename":"merge3-0.0.12-py3-none-any.whl","has_sig":false,"md5_digest":"8ced7a7d8feff0235e3f58b51af24a0e","packagetype":"bdist_wheel","python_version":"py3","requires_python":null,"size":17874,"upload_time":"2022-11-20T12:25:16","upload_time_iso_8601":"2022-11-20T12:25:16.528915Z","url":"https://files.pythonhosted.org/packages/12/56/27d09d7bcc9222522f71aac3b0b1696132af4a11f9e0cdccd53bb32b6bfe/merge3-0.0.12-py3-none-any.whl","yanked":false,"yanked_reason":null},{"comment_text":"","digests":{"blake2b_256":"7d1d1a2a0ff25b18cc3b7af41180821099696c2c34e4459fff09a2d19729281e","md5":"1e62f7b01f2336f8771ec2edb6b9f991","sha256":"fd3fc873dcf60b9944606d125f72643055c739ff41793979ccbdea3ea6818d36"},"downloads":-1,"filename":"merge3-0.0.12.tar.gz","has_sig":false,"md5_digest":"1e62f7b01f2336f8771ec2edb6b9f991","packagetype":"sdist","python_version":"source","requires_python":null,"size":17454,"upload_time":"2022-11-20T12:25:18","upload_time_iso_8601":"2022-11-20T12:25:18.409844Z","url":"https://files.pythonhosted.org/packages/7d/1d/1a2a0ff25b18cc3b7af41180821099696c2c34e4459fff09a2d19729281e/merge3-0.0.12.tar.gz","yanked":false,"yanked_reason":null}],"0.0.13":[{"comment_text":"","digests":{"blake2b_256":"61fc0eb72422b8f64643ca7d9bc2b9076ec550388ff8e1022425fa11e7012e94","md5":"da44d9726a6b82c0146b6235d8e465cd","sha256":"4f8ee5f8c61823ff7c3ae68e6d0d2966bbf249bb08dc5e6f2abffd8d97c62cf3"},"downloads":-1,"filename":"merge3-0.0.13-py3-none-any.whl","has_sig":false,"md5_digest":"da44d9726a6b82c0146b6235d8e465cd","packagetype":"bdist_wheel","python_version":"py3","requires_python":null,"size":14680,"upload_time":"2023-02-07T20:39:24","upload_time_iso_8601":"2023-02-07T20:39:24.442838Z","url":"https://files.pythonhosted.org/packages/61/fc/0eb72422b8f64643ca7d9bc2b9076ec550388ff8e1022425fa11e7012e94/merge3-0.0.13-py3-none-any.whl","yanked":false,"yanked_reason":null},{"comment_text":"","digests":{"blake2b_256":"dc91647a2942b6f308c7dce358bec770fe62ee0689cfd1dd218b66e244acde7d","md5":"478955e6f5563644e0e62aec0c572aa5","sha256":"8abda1d2d49776323d23d09bfdd80d943a57d43d28d6152ffd2c87956a9b6b54"},"downloads":-1,"filename":"merge3-0.0.13.tar.gz","has_sig":false,"md5_digest":"478955e6f5563644e0e62aec0c572aa5","packagetype":"sdist","python_version":"source","requires_python":null,"size":13603,"upload_time":"2023-02-07T20:39:26","upload_time_iso_8601":"2023-02-07T20:39:26.975182Z","url":"https://files.pythonhosted.org/packages/dc/91/647a2942b6f308c7dce358bec770fe62ee0689cfd1dd218b66e244acde7d/merge3-0.0.13.tar.gz","yanked":false,"yanked_reason":null}],"0.0.14":[{"comment_text":"","digests":{"blake2b_256":"17a85e085653871c70d1b139d7888d0f79ba82d130106157cfc16a9e8078d086","md5":"8546ae3fc037d69070d23ec5a0d8a831","sha256":"7ac0aadbd9ff5bea89ba9bd3796cb26e0df361dc86a381055ce0a45a7b8726ec"},"downloads":-1,"filename":"merge3-0.0.14-py3-none-any.whl","has_sig":false,"md5_digest":"8546ae3fc037d69070d23ec5a0d8a831","packagetype":"bdist_wheel","python_version":"py3","requires_python":">=3.6","size":7950,"upload_time":"2023-09-17T11:50:26","upload_time_iso_8601":"2023-09-17T11:50:26.049150Z","url":"https://files.pythonhosted.org/packages/17/a8/5e085653871c70d1b139d7888d0f79ba82d130106157cfc16a9e8078d086/merge3-0.0.14-py3-none-any.whl","yanked":false,"yanked_reason":null},{"comment_text":"","digests":{"blake2b_256":"af4098be4a5641b0244be5881ff5e00057f8227ff183d8675a697bdfeae43b1a","md5":"e20464fec7d124550c3e2c1616c1a0e9","sha256":"30406e99386f4a65280fb9c43e681890fa2a1d839cac2759d156c7cc16030159"},"downloads":-1,"filename":"merge3-0.0.14.tar.gz","has_sig":false,"md5_digest":"e20464fec7d124550c3e2c1616c1a0e9","packagetype":"sdist","python_version":"source","requires_python":">=3.6","size":17742,"upload_time":"2023-09-17T11:50:27","upload_time_iso_8601":"2023-09-17T11:50:27.713705Z","url":"https://files.pythonhosted.org/packages/af/40/98be4a5641b0244be5881ff5e00057f8227ff183d8675a697bdfeae43b1a/merge3-0.0.14.tar.gz","yanked":false,"yanked_reason":null}],"0.0.15":[{"comment_text":"","digests":{"blake2b_256":"d2cd67e3bd2bba4bdc22aee41b27aa865500254c87ab48631ff64008b6ecc1a8","md5":"0672769e1ac41c6490c68d9d64d142e2","sha256":"97b5f54a17181be261fde03a10cf55f34f910b19fe81e21cbd5fe87a3395c4a6"},"downloads":-1,"filename":"merge3-0.0.15-py3-none-any.whl","has_sig":false,"md5_digest":"0672769e1ac41c6490c68d9d64d142e2","packagetype":"bdist_wheel","python_version":"py3","requires_python":">=3.8","size":14987,"upload_time":"2024-05-05T16:18:24","upload_time_iso_8601":"2024-05-05T16:18:24.296532Z","url":"https://files.pythonhosted.org/packages/d2/cd/67e3bd2bba4bdc22aee41b27aa865500254c87ab48631ff64008b6ecc1a8/merge3-0.0.15-py3-none-any.whl","yanked":false,"yanked_reason":null},{"comment_text":"","digests":{"blake2b_256":"91e1fe09c161f80b5a8d8ede3270eadedac7e59a64ea1c313b97c386234480c1","md5":"26b5483e68cc6c13f0d86edbb6daa72a","sha256":"d3eac213d84d56dfc9e39552ac8246c7860a940964ebeed8a8be4422f6492baf"},"downloads":-1,"filename":"merge3-0.0.15.tar.gz","has_sig":false,"md5_digest":"26b5483e68cc6c13f0d86edbb6daa72a","packagetype":"sdist","python_version":"source","requires_python":">=3.8","size":14121,"upload_time":"2024-05-05T16:18:26","upload_time_iso_8601":"2024-05-05T16:18:26.027455Z","url":"https://files.pythonhosted.org/packages/91/e1/fe09c161f80b5a8d8ede3270eadedac7e59a64ea1c313b97c386234480c1/merge3-0.0.15.tar.gz","yanked":false,"yanked_reason":null}],"0.0.2":[{"comment_text":"","digests":{"blake2b_256":"8b5cbaef7edc9e570a48a82be3bcf92db86fe3d3dcbebe40ef1113e614149f58","md5":"d5b14233bd3de5b93bb046272fa57c79","sha256":"35f2d6a5ea45d6dc16afb577205e5dd131146f2f8aa446e34f4228eb09afc52f"},"downloads":-1,"filename":"merge3-0.0.2.tar.gz","has_sig":false,"md5_digest":"d5b14233bd3de5b93bb046272fa57c79","packagetype":"sdist","python_version":"source","requires_python":null,"size":8937,"upload_time":"2018-08-02T18:36:08","upload_time_iso_8601":"2018-08-02T18:36:08.506432Z","url":"https://files.pythonhosted.org/packages/8b/5c/baef7edc9e570a48a82be3bcf92db86fe3d3dcbebe40ef1113e614149f58/merge3-0.0.2.tar.gz","yanked":false,"yanked_reason":null}],"0.0.3":[{"comment_text":"","digests":{"blake2b_256":"d50e500030c5835802ff4732a6fff92db94de3425e92bd4ed0800d4ec55b78c8","md5":"f7eff363c5f9e8b26eff2ff4ee1136da","sha256":"891d38e7e03498d5e482e19a701abf8b823b15b86966bd5e5c00da7280500da6"},"downloads":-1,"filename":"merge3-0.0.3.tar.gz","has_sig":false,"md5_digest":"f7eff363c5f9e8b26eff2ff4ee1136da","packagetype":"sdist","python_version":"source","requires_python":null,"size":16637,"upload_time":"2020-05-23T22:20:20","upload_time_iso_8601":"2020-05-23T22:20:20.037323Z","url":"https://files.pythonhosted.org/packages/d5/0e/500030c5835802ff4732a6fff92db94de3425e92bd4ed0800d4ec55b78c8/merge3-0.0.3.tar.gz","yanked":false,"yanked_reason":null}],"0.0.4":[{"comment_text":"","digests":{"blake2b_256":"5b51603938bac36447a2416d58087a21acb488308b6ad90554a5c29a71b47ad3","md5":"7369a27b187f4d87350a5784189c63ec","sha256":"33c896c436f319f5344647abd3b12d4738bc45bd7db490fe54f997f5484a14c0"},"downloads":-1,"filename":"merge3-0.0.4.tar.gz","has_sig":false,"md5_digest":"7369a27b187f4d87350a5784189c63ec","packagetype":"sdist","python_version":"source","requires_python":null,"size":16647,"upload_time":"2021-02-05T01:56:29","upload_time_iso_8601":"2021-02-05T01:56:29.537070Z","url":"https://files.pythonhosted.org/packages/5b/51/603938bac36447a2416d58087a21acb488308b6ad90554a5c29a71b47ad3/merge3-0.0.4.tar.gz","yanked":false,"yanked_reason":null}],"0.0.7":[{"comment_text":"","digests":{"blake2b_256":"9a3acd00ce76e31e5a011ea1025c6063c1897b34650f7f6752d26715546bd860","md5":"8e7dc81be76ce440069858c0552d9699","sha256":"0cd4eecba802733866ace6ca4e68eacbea31e4ca88eb410a09622d9631520258"},"downloads":-1,"filename":"merge3-0.0.7.tar.gz","has_sig":false,"md5_digest":"8e7dc81be76ce440069858c0552d9699","packagetype":"sdist","python_version":"source","requires_python":null,"size":16909,"upload_time":"2021-03-13T00:34:24","upload_time_iso_8601":"2021-03-13T00:34:24.302010Z","url":"https://files.pythonhosted.org/packages/9a/3a/cd00ce76e31e5a011ea1025c6063c1897b34650f7f6752d26715546bd860/merge3-0.0.7.tar.gz","yanked":false,"yanked_reason":null}],"0.0.8":[{"comment_text":"","digests":{"blake2b_256":"9ea0ebac6ed4b7c174832616731c3466e86768a2b856e03043ac55e1e5d49a5a","md5":"225c89dbf56f7b62767ac8a8750d5af4","sha256":"4ef90eda29fb6f291e5d5ee1103ae97e295e15826ef17abee3098f5ce46fe18b"},"downloads":-1,"filename":"merge3-0.0.8.tar.gz","has_sig":false,"md5_digest":"225c89dbf56f7b62767ac8a8750d5af4","packagetype":"sdist","python_version":"source","requires_python":null,"size":17376,"upload_time":"2021-03-13T13:36:11","upload_time_iso_8601":"2021-03-13T13:36:11.269467Z","url":"https://files.pythonhosted.org/packages/9e/a0/ebac6ed4b7c174832616731c3466e86768a2b856e03043ac55e1e5d49a5a/merge3-0.0.8.tar.gz","yanked":false,"yanked_reason":null}],"0.0.9":[{"comment_text":"","digests":{"blake2b_256":"7b8693994c5a6581ab7792ab917e5abfa509f7a1719f865e2f92a22304469176","md5":"f5f9edc8654c312840475b897cb12177","sha256":"e945c08c2aadcfd2d88c1511b839b90d3ce601bb5b9a39809d74b231bfc5ebcc"},"downloads":-1,"filename":"merge3-0.0.9.tar.gz","has_sig":false,"md5_digest":"f5f9edc8654c312840475b897cb12177","packagetype":"sdist","python_version":"source","requires_python":null,"size":17177,"upload_time":"2022-09-25T01:10:06","upload_time_iso_8601":"2022-09-25T01:10:06.352005Z","url":"https://files.pythonhosted.org/packages/7b/86/93994c5a6581ab7792ab917e5abfa509f7a1719f865e2f92a22304469176/merge3-0.0.9.tar.gz","yanked":false,"yanked_reason":null}]},"urls":[{"comment_text":"","digests":{"blake2b_256":"d2cd67e3bd2bba4bdc22aee41b27aa865500254c87ab48631ff64008b6ecc1a8","md5":"0672769e1ac41c6490c68d9d64d142e2","sha256":"97b5f54a17181be261fde03a10cf55f34f910b19fe81e21cbd5fe87a3395c4a6"},"downloads":-1,"filename":"merge3-0.0.15-py3-none-any.whl","has_sig":false,"md5_digest":"0672769e1ac41c6490c68d9d64d142e2","packagetype":"bdist_wheel","python_version":"py3","requires_python":">=3.8","size":14987,"upload_time":"2024-05-05T16:18:24","upload_time_iso_8601":"2024-05-05T16:18:24.296532Z","url":"https://files.pythonhosted.org/packages/d2/cd/67e3bd2bba4bdc22aee41b27aa865500254c87ab48631ff64008b6ecc1a8/merge3-0.0.15-py3-none-any.whl","yanked":false,"yanked_reason":null},{"comment_text":"","digests":{"blake2b_256":"91e1fe09c161f80b5a8d8ede3270eadedac7e59a64ea1c313b97c386234480c1","md5":"26b5483e68cc6c13f0d86edbb6daa72a","sha256":"d3eac213d84d56dfc9e39552ac8246c7860a940964ebeed8a8be4422f6492baf"},"downloads":-1,"filename":"merge3-0.0.15.tar.gz","has_sig":false,"md5_digest":"26b5483e68cc6c13f0d86edbb6daa72a","packagetype":"sdist","python_version":"source","requires_python":">=3.8","size":14121,"upload_time":"2024-05-05T16:18:26","upload_time_iso_8601":"2024-05-05T16:18:26.027455Z","url":"https://files.pythonhosted.org/packages/91/e1/fe09c161f80b5a8d8ede3270eadedac7e59a64ea1c313b97c386234480c1/merge3-0.0.15.tar.gz","yanked":false,"yanked_reason":null}],"vulnerabilities":[]}