diff options
author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2013-04-12 20:45:00 -0400 |
---|---|---|
committer | Allan McRae <allan@archlinux.org> | 2013-06-03 13:33:47 +1000 |
commit | aa7e42db11ea545572a9519e88e2a6cdeeffb3bf (patch) | |
tree | a1fdf2b0e1f9e72326573a3d03b68c969523b1b0 /scripts | |
parent | 5cfa4ec47ed6240fecb1c2a9fd95de5bdc58a8b8 (diff) |
conflict.c: do not ignore symlink<->dir conflicts
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions