Commit Graph

1 Commits

Author SHA1 Message Date
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