diff options
| author | Akim Demaille <akim@lrde.epita.fr> | 2012-05-08 10:17:46 +0200 |
|---|---|---|
| committer | Akim Demaille <akim@lrde.epita.fr> | 2012-05-08 10:17:46 +0200 |
| commit | e2eb03d4e9306f8ec5fa15c47c2016409c5fca9d (patch) | |
| tree | 76bebcb061e1c358272794a74b310d615ac830fe /.gitattributes | |
| parent | db0054f7e6add2be825481bfa2f2dd2bb938aff3 (diff) | |
| download | bison-e2eb03d4e9306f8ec5fa15c47c2016409c5fca9d.tar.gz | |
maint: we no longer maintain the ChangeLog.
* .gitattributes: No need to merge it.
* README-hacking: Update release instructions.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index e8495d51..8b137891 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -ChangeLog merge=merge-changelog + |