kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
2,072 Commits
6 Branches
986 Tags
179 MiB
Commit Graph

2 Commits (3e09cdfd114651fc61656dbd45d5ec3d9352cb2b)

Author SHA1 Message Date
Daniel Barkalow 7061f5c2c5 [PATCH] Finish documenting trivial merge rules 
Fix missing symbol explanations, a few incorrect cases, and add
two-way merge rules.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2005-09-24 22:05:55 -07:00
Daniel Barkalow 3d89cb4f3f [PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges. 
Signed-off-by: Daniel Barkalow
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2005-09-10 18:27:41 -07:00