diff options
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | .gitignore | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..e8495d51e --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +ChangeLog merge=merge-changelog diff --git a/.gitignore b/.gitignore index 63230ba11..81e5a98ef 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,7 @@ automake config.cache config.log config.status +config.status.lineno +configure.lineno tags TAGS |