![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Alex Riesen <raa.lkml@gmail.com> | |
| Thu, 25 Sep 2008 20:12:45 +0000 (22:12 +0200) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 26 Sep 2008 15:05:20 +0000 (08:05 -0700) | ||
| commit | 41f13af558db1018250ade4d99a51f0b76f65bc8 | |
| tree | dc814ce79f66195754488b50889f8808d79dfb73 | tree | snapshot |
| parent | fee75457fc45e299c2a962bb9c3949f33f176c02 | commit | diff |
Remove empty directories in recursive merge
The code was actually supposed to do that, but was accidentally broken.
Noticed by Anders Melchiorsen.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
The code was actually supposed to do that, but was accidentally broken.
Noticed by Anders Melchiorsen.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| builtin-merge-recursive.c | diff | blob | history | |
| t/t3030-merge-recursive.sh | diff | blob | history |