diff tests/test-rename-after-merge.out @ 7057:094af6eeb7d7

fix conflicting variables when no native osutil is available thanks weijun for the bug report and patch, fix issue1309
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 29 Sep 2008 11:57:27 +0200
parents 0750f11152fe
children d821ea464465
line wrap: on
line diff