[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)
commit3d89cb4...3f5333d5eb5899352566ad071dbd0d0c
tree4839378...b41288eaacc91dc12ab9f9e6b8233747copy hash to clipboard (tree)
parentee6566e...d70da682ac4926dd8a67ac821b2c1743copy hash to clipboard (diff)
Documentation/technical/trivial-merge.txt [new file with mode: 0644]