projects
/
m6w6
/
ext-pq
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
| inline |
side by side
(parent:
f5fbe28
)
fix typo
author
Michael Wallner
<mike@php.net>
Fri, 4 Dec 2015 14:06:00 +0000
(15:06 +0100)
committer
Michael Wallner
<mike@php.net>
Fri, 4 Dec 2015 14:06:00 +0000
(15:06 +0100)
.gitattributes
patch
|
blob
|
history
diff --git
a/.gitattributes
b/.gitattributes
index 4ae09e12bb0ecdb16ad7d518bf792ecd913064db..8d1a06c88d1a730cf666fc6751c8d3c9c24b3866 100644
(file)
--- a/
.gitattributes
+++ b/
.gitattributes
@@
-1,2
+1,2
@@
package.xml merge=touch
-php_pq.
g
merge=touch
+php_pq.
h
merge=touch