| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Git config merge.conflictStyle diff3 | June McEnroe | 2018-02-21 |
| | | | | | | This is probably a good idea, though I haven't run into a merge conflict yet. | ||
| * | Move actual dotfiles into home directory | June McEnroe | 2017-06-10 |