![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 17 Apr 2007 23:55:46 +0000 (16:55 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 17 Apr 2007 23:55:46 +0000 (16:55 -0700) | ||
| commit | 35812d830579643f898979be479b6fee5f7c7b38 | |
| tree | 661e58853ae6b9541f1a63b97ad9db5a87809c8a | tree | snapshot |
| parent | bb1faf0d5bc53b193bbe25e7425458c8eb85efa3 | commit | diff |
| parent | 885b98107547fe3f6d17ca0af0578e040f7600d0 | commit | diff |
Merge branch 'jc/read-tree-df'
* jc/read-tree-df:
t3030: merge-recursive backend test.
merge-recursive: handle D/F conflict case more carefully.
merge-recursive: do not barf on "to be removed" entries.
Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()
t1000: fix case table.
* jc/read-tree-df:
t3030: merge-recursive backend test.
merge-recursive: handle D/F conflict case more carefully.
merge-recursive: do not barf on "to be removed" entries.
Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()
t1000: fix case table.