title: svn merge --dry-run Show svn diff
body: <p>I'm working with a codebase that has (historically) been merged by hand rather than via <code>svn merge</code>.  I'm trying to change that by proving to everyone how useful merge is - but when I do a dry run, I get this:</p>
  
  <pre><code>$ svn merge [[Repo URL]] . -c 21355,21358,21364,21370,21371,21373 --dry-run
  --- Merging r21355 into '.':
  U    [[File 1]]
  --- Merging r21355 into '[[dir]]':
  U    [[dir]]/[[File 2]]
  U    [[dir]]/[[File 3]]
  --- Merging r21358 into '[[dir]]':
  U    [[dir]]/[[File 4]]
  --- Merging r21364 into '[[dir]]':
  U    [[dir]]/[[File 2]]
  C    [[dir]]/[[File 4]]    
  --- Merging r21370 into '[[dir]]':
  U    [[dir]]/[[File 5]]
  --- Merging r21371 into '[[dir]]':
  U    [[dir]]/[[File 5]]
  --- Merging r21373 into '[[dir]]':
  C    [[dir]]/[[File 5]]
  U    [[dir]]/[[File 6]]
  Summary of conflicts:
    Text conflicts: 2
  </code></pre>
  
  <p>I have two files (listed as 4 and 5, respectively), that survive one merge only to pop a conflict with the last one.  I'm trying to figure out what that conflict is now, and see if I can resolve it.  I'd like it if I can force svn to spit out the diff of the two conflicted changes.</p>
  
  <p>I checked out a new working copy of just the narrowest directory, and when I ran the merge without dry run, I got:</p>
  
  <pre><code>--- Merging r21355 into '.':
  U    [[File 3]]
  --- Merging r21358 into '.':
  U    [[File 4]]
  --- Merging r21364 into '.':
  G    [[File 4]]
  --- Merging r21370 into '.':
  U    [[File 5]]
  --- Merging r21371 into '.':
  G    [[File 5]]
  --- Merging r21373 into '.':
  G    [[File 5]]
  </code></pre>
  
  <p>(Files 1, 2, and 6 reside elsewhere)</p>
  
  <p>So, now I'm especially confused - dry run reports a conflict, but when the merge is actually run, it's successful?  Is this intended behaviour?  I'll admit I'm no SVN wizard, but I'm left quite bewildered.</p>