Skip to content

Commit

Permalink
use smerge-mode
Browse files Browse the repository at this point in the history
  • Loading branch information
MatthewZMD committed Jun 11, 2019
1 parent 3f30ca1 commit 21b7514
Show file tree
Hide file tree
Showing 3 changed files with 191 additions and 171 deletions.
Loading

0 comments on commit 21b7514

Please sign in to comment.