diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-06-08 14:55:35 -0700 |
|---|---|---|
| committer |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 15:56:09 -0700 |
| commit | f225b21807a5f6ac589132e4d004e78038d23375 (patch) | |
| tree | 59bcd6b273780f53869371a44b1376cc671d166e /unpack-file.c | |
| parent | [PATCH] Fix git-merge-one-file permissions auto-merging (diff) | |
| download | tgif-f225b21807a5f6ac589132e4d004e78038d23375.tar.xz | |
[PATCH] Add read-tree -m 3-way merge tests.
This adds a set of tests to make sure that requirements on
existing cache entries are checked when a read-tree -m 3-way
merge is run with an already populated index file.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'unpack-file.c')
0 files changed, 0 insertions, 0 deletions