diff tests/test-merge-tools @ 10836:e5aaa4543289 stable

dirstate: fix in memory dirstate entries for 1-second race Only the on-disk file was modified, we need to modify the in-memory dirstate as well.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 05 Apr 2010 18:13:20 +0200
parents c52057614c72
children 4c94b6d0fb1c
line wrap: on
line diff