projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ee6566e) | patch
[PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.
authorDaniel Barkalow <barkalow@iabervon.org>
Mon, 5 Sep 2005 06:05:17 +0000 (02:05 -0400)
committerJunio C Hamano <junkio@cox.net>
Sun, 11 Sep 2005 01:27:41 +0000 (18:27 -0700)
commit3d89cb4f3f5333d5eb5899352566ad071dbd0d0c
tree4839378eb41288eaacc91dc12ab9f9e6b8233747tree | snapshot
parentee6566e8d70da682ac4926dd8a67ac821b2c1743commit | diff
[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>
Documentation/technical/trivial-merge.txt [new file with mode: 0644] blob
Git—the stupid content tracker