Merge branch 'jk/error-resolve-conflict-advice'
[gitweb.git] / t / t4018 / cpp-struct-single-line
2014-03-21 userdiff: have 'cpp' hunk header pattern catch more...
2014-03-21 t4018: test cases showing that the cpp pattern misses...