search

ArneBachmann / sos

Subversion Offline Solution
https://sos-vcs.net
Mozilla Public License 2.0
6 stars 1 forks source link

Interactive merge using prompt_toolkit? #28

Open ArneBachmann opened 7 years ago

ArneBachmann commented 6 years ago

Or ncurses for diff? could color insert/delete and intra-line details (purple for mod)

ArneBachmann commented 6 years ago

https://pypi.python.org/pypi/colorama https://pypi.python.org/pypi/termcolor

ArneBachmann commented 6 years ago

Was implemented in #256

ArneBachmann commented 6 years ago

The issue is not about colors, more about interactive merge. Therefore opening once more and adding correct reference link: https://github.com/jonathanslenders/python-prompt-toolkit

ArneBachmann commented 5 years ago

Will find more details when creating the tutorial.