Skip to content

Commit

Permalink
[dosc] Fix typo in set-up instructions of git merge driver (#527)
Browse files Browse the repository at this point in the history
  • Loading branch information
wetneb authored May 28, 2024
1 parent 2d7254b commit 5306814
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ files, all you need is to add a couple of lines to a couple of configuration fil
```

`spork` doesn't mean anything to Git yet, we need to actually define the merge driver called `spork`. We do that in the
`.gitattributes` file, typically located in your home directory. You should put the following content into it:
`.gitconfig` file, typically located in your home directory. You should put the following content into it:

```
[core]
Expand Down

0 comments on commit 5306814

Please sign in to comment.