projects
/
git.git
/ tree
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
| tree
history
|
HEAD
|
snapshot
[PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.
[git.git]
/
Documentation
/
technical
/
drwxr-xr-x
..
-rw-r--r--
3251
trivial-merge.txt
blob
|
history
|
raw
projects / git.git / tree