log tests/test-merge5 @ 695:085a8145e151

age author description
Tue, 21 Jun 2005 19:14:11 -0800 mpm [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted