diff options
Diffstat (limited to 'examples/redis-unstable/.gitattributes')
| -rw-r--r-- | examples/redis-unstable/.gitattributes | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/examples/redis-unstable/.gitattributes b/examples/redis-unstable/.gitattributes deleted file mode 100644 index 697a900..0000000 --- a/examples/redis-unstable/.gitattributes +++ /dev/null @@ -1,6 +0,0 @@ -# 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 |