mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-30 05:32:08 +02:00
Code
1,987 Commits 6 Branches 954 Tags 460 MiB
fb8024b414
Commit Graph

2 Commits

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