From: Alex Riesen <raa.lkml@gmail.com>
Date: Thu, 25 Sep 2008 20:12:45 +0000 (+0200)
Subject: Remove empty directories in recursive merge
X-Git-Tag: v1.6.0.3~60
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/41f13af558db1018250ade4d99a51f0b76f65bc8?hp=41f13af558db1018250ade4d99a51f0b76f65bc8

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>
---