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
git-merge documentation: more details about resolving conflicts
2008-08-23
Dan H
e
nsg
e
n
git-m
e
rge d
o
c
umentation:
mo
r
e details about res
o
lvi
n
g
.
.
.
commit
|
commitdiff
|
tree