diff options
| author | June McEnroe <programble@gmail.com> | 2018-02-21 19:27:33 -0500 |
|---|---|---|
| committer | June McEnroe <programble@gmail.com> | 2018-02-21 19:27:33 -0500 |
| commit | 4a2ab5123eac872d7c16fc4ef14731d053da1f38 (patch) | |
| tree | 024f8aaedb82f80baa1086a1873cf29ba5941d7d /bin/xx.c | |
| parent | Switch to and vendor Go Mono font (diff) | |
| download | src-4a2ab5123eac872d7c16fc4ef14731d053da1f38.tar.gz src-4a2ab5123eac872d7c16fc4ef14731d053da1f38.zip | |
Git config merge.conflictStyle diff3
This is probably a good idea, though I haven't run into a merge conflict yet.
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions