David Hart f700b23f57 Add git merge rule (#755) ...

This fixes https://github.com/nvbn/thefuck/issues/629

2018-01-02 11:47:48 -05:00

..

entrypoints

#715: Fix work on Windows

2017-10-25 19:16:28 +02:00

output_readers

fixes #692 : multiline PS1 breaking instant mode

2017-09-17 16:16:48 +01:00

rules

Add git merge rule (#755)

2018-01-02 11:47:48 -05:00

shells

#783: Don't rely on $SHELL for detecting shell

2017-11-27 21:08:46 +01:00

specific

#N/A: FIx new flake8 warnings

2017-10-25 19:31:03 +02:00

system

#711: Handle ctrl+n and ctrl+p

2017-10-16 19:19:29 +02:00

__init__.py

Add python 2 support

2015-04-17 16:24:03 +02:00

argument_parser.py

#682: Use our own shell logger, fix experimental instant mode on macos

2017-10-08 16:17:41 +02:00

conf.py

#682: Implement experimental instant mode

2017-08-25 11:44:07 +02:00

const.py

#711: Handle ctrl+n and ctrl+p

2017-10-16 19:19:29 +02:00

corrector.py

#737: Add support of third-party rules

2017-11-23 20:21:44 +01:00

exceptions.py

#682: Implement experimental instant mode

2017-08-25 11:44:07 +02:00

logs.py

#682: Make warnings more visible

2017-08-26 14:30:19 +02:00

types.py

#682: Unify work with output in classic and instant mode

2017-08-31 17:58:56 +02:00

ui.py

#711: Handle ctrl+n and ctrl+p

2017-10-16 19:19:29 +02:00

utils.py

#708: Fix handling of shelve errors

2017-10-10 19:19:54 +02:00