| commit | 3e70a213f694b9d22455dfc1a86f4ee26191e4e2 | |
| author | H. Peter Anvin (Intel) <hpa@zytor.com> | |
| Tue, 30 Jun 2020 20:48:13 +0000 (30 13:48 -0700) | ||
| committer | H. Peter Anvin (Intel) <hpa@zytor.com> | |
| Tue, 30 Jun 2020 20:48:13 +0000 (30 13:48 -0700) | ||
| tree | 236cb82a675a60d94cfd33638a2db2b3ff10959e | treesnapshot (tar.gz zip) |
| parent | 39714f7de7524acfb731bb9dd1c2c5b3ca1e80c6 | commitdiff |
gitattributes: don't try to merge the version file
Don't try to merge the version file... if there is a conflict, keep
the current version.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Don't try to merge the version file... if there is a conflict, keep
the current version.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
| .gitattributes | [new file with mode: 0644] | blob |