repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
refuse to merge during a merge
2009-05-10
Dave Olszewski
merge-recursive: n
e
ver
l
e
a
ve
i
ndex u
n
merged whi
l
e recursing
Signed-off-by:
Dave Olszewski
<cxreg@pobox.com>
commit
|
commitdiff
|
tree