summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Alex Riesen <raa.lkml@gmail.com>2008-09-25 22:12:45 +0200
committerLibravatar Shawn O. Pearce <spearce@spearce.org>2008-09-26 08:05:20 -0700
commit41f13af558db1018250ade4d99a51f0b76f65bc8 (patch)
treedc814ce79f66195754488b50889f8808d79dfb73 /merge-recursive.c
parentDocumentation: clarify the details of overriding LESS via core.pager (diff)
downloadtgif-41f13af558db1018250ade4d99a51f0b76f65bc8.tar.xz
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>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions