FilesExpand file tree

 unstable

/

.gitattributes

Copy path

Blame

More file actions

Blame

More file actions

Latest commit

 

History

History

History

6 lines (6 loc) · 405 Bytes

 unstable

/

.gitattributes

Copy path

Top

File metadata and controls

• Code
• Blame

6 lines (6 loc) · 405 Bytes

Raw

Copy raw file

Download raw file

Open symbols panel

Edit and raw actions

1

2

3

4

5

6

# We set commands.c's merge driver to `binary` so when it conflicts during a

# merge git will leave the local version unmodified. This way our Makefile

# will rebuild it based on src/commands/*.json before trying to compile it.

# Otherwise the file gets modified and gets the same timestamp as the .json

# files. So the Makefile doesn't attempt to rebuild it before compiling.

src/commands.c merge=binary