diff options
| author |  Daniel Barkalow <barkalow@iabervon.org> | 2005-09-05 02:05:17 -0400 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2005-09-10 18:27:41 -0700 |
| commit | 3d89cb4f3f5333d5eb5899352566ad071dbd0d0c (patch) | |
| tree | 4839378eb41288eaacc91dc12ab9f9e6b8233747 /blob.c | |
| parent | [PATCH] Rewrite read-tree (diff) | |
| download | tgif-3d89cb4f3f5333d5eb5899352566ad071dbd0d0c.tar.xz | |
[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 'blob.c')
0 files changed, 0 insertions, 0 deletions