averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-06-09 15:37:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
4eba0f3763e2f4bbf614c99ae3a5b299e8d61aff
git-mirror/Documentation/technical
T
History
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
..
trivial-merge.txt
[PATCH] Finish documenting trivial merge rules
2005-09-24 22:05:55 -07:00