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? That sounds sensible, and I think binary files should do the same. -- Philip
