diff options
| author |  Fredrik Kuivinen <freku045@student.liu.se> | 2005-12-03 11:41:54 +0100 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2005-12-03 12:29:07 -0800 |
| commit | 7057463463ad01266db264acf7e7b5e95e7b4ecf (patch) | |
| tree | 5879baecaf61e2abd082f89d118cda7a5e024b2b /compat | |
| parent | New test case: merge with directory/file conflicts (diff) | |
| download | tgif-7057463463ad01266db264acf7e7b5e95e7b4ecf.tar.xz | |
New test case: Criss-cross merge
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'compat')
0 files changed, 0 insertions, 0 deletions