diff options
| author | Frank Lichtenheld <frank@lichtenheld.de> | 2007-05-21 00:31:57 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-22 00:00:42 -0700 |
| commit | 1978659a7421098095fd6a8613302771cae81dd1 (patch) | |
| tree | bbd5c27849a5c1d66245b2dbef62b68c46aeeb08 /builtin-merge-file.c | |
| parent | 1d431b22357389d0833830daf814ff0c4dc9189d (diff) | |
| download | git-1978659a7421098095fd6a8613302771cae81dd1.tar.gz | |
t9400: Add some more cvs update tests
Add some cvs update tests that include various merge
situations. Also add a basic test for update -C
since it fits so well in there.
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions