Joshua Nichols cde7989e85 Fix conflict resolution when destination is a plain file (not a symlink).

2010-03-31 23:18:38 -04:00

..

homesick

Fix conflict resolution when destination is a plain file (not a symlink).

2010-03-31 23:18:38 -04:00