diff tests/test-merge-prompt.out @ 6103:e668fd796b8b

Propagating changes back to working dirs when changing files in external
author Fabio Zadrozny <fabiofz at gmail dot com>
date Sun, 26 Aug 2007 21:31:18 -0300
parents 8a5d8fb59ed2
children 4b0c9c674707
line wrap: on
line diff