repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Remove filename from conflict markers
2009-07-02
Martin Ren
o
ld
Remove
f
ilename
f
rom conflict
mark
e
r
s
Signed-off-by: Martin Renold <
martinxyz@gmx.ch
>
commit
|
commitdiff
|
tree