repo.or.cz
/
git
/
gitweb.git
/
tree
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
history
|
HEAD
|
snapshot (
tar.gz
zip
)
Use git-merge instead of git-resolve in git-pull.
[git/gitweb.git]
/
Documentation
/
technical
/
tree
0498861744be9dadce15733090dd96f3c6cc4474
drwxr-xr-x
..
-rw-r--r--
3251
trivial-merge.txt
blob
|
blame
|
history
|
raw
