Skip to content

Commit cdc2ceb

Browse files
authored
chore: explain the baml_client merge driver in gitconfig (#2554)
1 parent 2c689dc commit cdc2ceb

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

.gitconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
[merge "baml_client"]
2+
# this just says the 'true' command is the merge driver, which stubs it out as a noop
3+
# normally it would be something like meld or tkdiff
24
driver = true
35
[checkout]
46
defaultRemote = origin

0 commit comments

Comments
 (0)