diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-12 19:23:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-12 19:23:09 -0700 |
| commit | 86183fbb09ffe5d46eae1cf52023a1b5f8fbc047 (patch) | |
| tree | c3e94766b5baa12f84020efe130291275ee01aef /.gitignore | |
| parent | cd5fff64e6014f9c1d4c2bc113fde19bd45d2db7 (diff) | |
| parent | a20b4d899ae75e075641d7bfe9462a239c8b9236 (diff) | |
| download | git-86183fbb09ffe5d46eae1cf52023a1b5f8fbc047.tar.gz git-86183fbb09ffe5d46eae1cf52023a1b5f8fbc047.tar.xz | |
Merge branch 'jn/conf'
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index fb0fa3f16..6e973b3d4 100644 --- a/.gitignore +++ b/.gitignore @@ -140,7 +140,7 @@ config.mak autom4te.cache config.log config.status -config.mak.in config.mak.autogen +config.mak.append configure git-blame |