On Friday 04 March 2011 05:15 PM, Philip Martin wrote:
Arwin Arni<ar...@collab.net> writes:
On Friday 04 March 2011 04:52 PM, Philip Martin wrote:
Arwin Arni<ar...@collab.net> writes:
Post this fix, I noticed that **merge --dry-run** throws an
interactive conflict resolution dialog and create the merge-left and
merge-right files.
Does this apply to all files or just binary files?
This applies only to binary files. For text files (dry-run), no
conflict resolution dialog, no left/right files..
So dry-run on a text-file conflict gives notification but no resolution
and no wc mods?
Absolutely right.
That sounds sensible, and I think binary files should
do the same.
Yes, I too think so. But post r1075802 this behaviour has changed and
none of the regression tests catch this because they don't do a
run_and_verify_merge with dry_run as TRUE in the "binary merge with
conflict" scenario.
