diff options
| author | Daniel Barkalow <barkalow@iabervon.org> | 2005-09-05 06:05:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-11 01:27:41 (GMT) |
| commit | 3d89cb4f3f5333d5eb5899352566ad071dbd0d0c (patch) | |
| tree | 4839378eb41288eaacc91dc12ab9f9e6b8233747 /t/t1000-read-tree-m-3way.sh | |
| parent | ee6566e8d70da682ac4926dd8a67ac821b2c1743 (diff) | |
| download | git-3d89cb4f3f5333d5eb5899352566ad071dbd0d0c.zip git-3d89cb4f3f5333d5eb5899352566ad071dbd0d0c.tar.gz git-3d89cb4f3f5333d5eb5899352566ad071dbd0d0c.tar.bz2 | |
[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>
Diffstat (limited to 't/t1000-read-tree-m-3way.sh')
0 files changed, 0 insertions, 0 deletions