Show More
@@ -393,9 +393,9 b' class BaseRepository(object):' | |||||
393 | on top of the target instead of being merged. |
|
393 | on top of the target instead of being merged. | |
394 | """ |
|
394 | """ | |
395 | if dry_run: |
|
395 | if dry_run: | |
396 |
message = message or ' |
|
396 | message = message or 'dry_run_merge_message' | |
397 |
user_email = user_email or ' |
|
397 | user_email = user_email or 'dry-run-merge@rhodecode.com' | |
398 |
user_name = user_name or 'user |
|
398 | user_name = user_name or 'Dry-Run User' | |
399 | else: |
|
399 | else: | |
400 | if not user_name: |
|
400 | if not user_name: | |
401 | raise ValueError('user_name cannot be empty') |
|
401 | raise ValueError('user_name cannot be empty') |
General Comments 0
You need to be logged in to leave comments.
Login now