tests/test-issue619.out
author Patrick Mezard <pmezard@gmail.com>
Sun, 08 Nov 2009 18:08:24 +0100
changeset 9818 72d670c43f6e
parent 6375 cdc458b12f0f
child 11173 5b48d819d5f9
permissions -rw-r--r--
patchbomb: normalize date format in generated mboxes mbox format should use time.asctime(). Unfortunately, this function writes 2-characters day of week on Windows while unix one writes a single character. Normalize to Windows version since the other one can hardly be written with strftime().

adding a
marked working directory as branch b
adding b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
fast-forward
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
bogus fast-forward should fail
abort: can't merge with ancestor
done