[MERGE] Changed diff filename from *.diff to *_diff.txt to make it easier to open on Windows.

[Gary van der Merwe]

On Wed, Feb 25, 2009 at 12:22 AM, Mark Hammond <skippy.hammond at gmail.com>
> What *is* the usual approach for qbzr?  If we don't have a .diff viewer,
> then there doesn't seem to be anything useful we can to the
> .diff/.patch/.bundle extensions at install time?

* We could should the revisions in the bundle, against the branch you
are going to merge in qlog (something that qmerge should be doing.)
* We could show a diff based on the revision data in the bundle, not
the patch text.
* We can open the merge dialog?