2 Commits

Author	SHA1	Message	Date
Vladimir Iakovlev	5b3350b2dd	#N/A: Fix tests with py.test 4	2018-11-21 19:43:01 +01:00
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