| commit | 7471b3f09e3df9fd066d54f2d577c4cfc2c680ea | |
| author | Bruno Haible <bruno@clisp.org> | |
| Thu, 2 Jul 2009 08:32:01 +0000 (2 10:32 +0200) | ||
| committer | Bruno Haible <bruno@clisp.org> | |
| Thu, 2 Jul 2009 08:32:01 +0000 (2 10:32 +0200) | ||
| tree | 8210be84483e9f810008ba9beb6a885fe7f8e22e | treesnapshot (tar.gz zip) |
| parent | 5d512d94df205840b8d915c0cfd28588562d07b8 | commitdiff |
Specify custom merge drivers.
| .gitattributes | [new file with mode: 0644] | blob |