annotate tests/test-keyword.hg @ 12664:545ec1775021

merge: handle no file parent in backwards merge (issue2364)
author Matt Mackall <mpm@selenic.com>
date Sat, 09 Oct 2010 14:50:20 -0500
parents de08788511d7
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6061
de08788511d7 test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
1 (binary:application/octet-stream)