branch | stable |
changeset 14824 | 7698c275aa56 |
parent 14569 | 017ab404e588 |
child 18376 | 13d73bf6be29 |
--- a/tests/test-convert-cvs-detectmerge.t Thu Jun 30 16:36:38 2011 +0200 +++ b/tests/test-convert-cvs-detectmerge.t Fri Jul 01 18:13:48 2011 +0200 @@ -54,6 +54,7 @@ modify file1 on branch v1_0 $ cvscall -Q update -rv1_0 + $ sleep 1 $ echo "change" >> file1 $ cvsci -m"add text" cvs commit: Examining .