Metadata-Version: 2.4
Name: mergepy
Version: 1.2.1
Summary: A cli-based python tool designed to merge 2 files together interactively (using python's difflib)
Author-email: Excited Bore <brunt-curry-wobble@duck.com>
Project-URL: Homepage, https://github.com/excited-bore/mergepy
Project-URL: Bug Tracker, https://github.com/excited-bore/mergepy/issues
Keywords: mergepy,textual,setuptools,development
Classifier: Programming Language :: Python :: 3
Classifier: License :: OSI Approved :: MIT License
Classifier: Operating System :: OS Independent
Requires-Python: >=3.7
Description-Content-Type: text/markdown
License-File: LICENSE
Requires-Dist: argcomplete>=3.6.3
Requires-Dist: textual>=3.0.20
Requires-Dist: PySide6>=6.11.1
Requires-Dist: Zenity>=2.0.0
Requires-Dist: tree-sitter>=0.25.2
Requires-Dist: tree-sitter-bash>=0.25.1
Requires-Dist: tree-sitter-c>=0.24.2
Requires-Dist: tree-sitter-c-sharp>=0.23.5
Requires-Dist: tree-sitter-cpp>=0.23.4
Requires-Dist: tree-sitter-css>=0.25.0
Requires-Dist: tree-sitter-embedded-template>=0.25.0
Requires-Dist: tree-sitter-go>=0.25.0
Requires-Dist: tree-sitter-html>=0.23.2
Requires-Dist: tree-sitter-java>=0.23.2
Requires-Dist: tree-sitter-javascript>=0.25.0
Requires-Dist: tree-sitter-json>=0.24.8
Requires-Dist: tree-sitter-php>=0.24.1
Requires-Dist: tree-sitter-python>=0.25.0
Requires-Dist: tree-sitter-ruby>=0.23.1
Requires-Dist: tree-sitter-rust>=0.24.2
Requires-Dist: tree-sitter-swift>=0.7.3
Requires-Dist: tree-sitter-typescript>=0.23.2
Requires-Dist: tree-sitter-yaml>=0.7.2
Requires-Dist: tree-sitter-zsh>=0.63.4
Dynamic: license-file

# `mergepy`

>[!important]
> TODO: Implement compatibility with git so it can be used as a mergetool 

## ℹ️ About

Mergepy is a cli-based python tool designed to merge 2 files together interactively by segmenting the 2 files into parts that are different and common. You easily select, then choose to keep or replace the conflicts by jumping between 2 panes and pressing enter (which will always replace a different part of the file and keep a common part) which will insert the selected text into a third pane which can be also used to edit the result. Mergepy uses python's standard 'difflib' to segment the files and uses textual, uses a rich renderable to highlight the syntax for the 2 file panes and uses treesitter to highlight the syntax in the editor pane.

