diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-06-05 23:18:16 -0700 |
|---|---|---|
| committer |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-05 23:33:38 -0700 |
| commit | c3f13d59f75e144e615b4a5b480348057a7b8b3f (patch) | |
| tree | 1992ffdae5a13665332140edc125ac88b499e767 /local-pull.c | |
| parent | Three-way merge: fix silly bug that made trivial merges not work (diff) | |
| download | tgif-c3f13d59f75e144e615b4a5b480348057a7b8b3f.tar.xz | |
[PATCH] 3-way merge tests for new "git-read-tree -m"?
The updated git-tread-tree -m is more strict in that it wants to
have the original cache up to date. The initial part of t1000
(merge tests from hell) fails due to it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'local-pull.c')
0 files changed, 0 insertions, 0 deletions