-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Markus Korn wrote: > ** Attachment added: "bzr.log.ext" > http://launchpadlibrarian.net/15632683/bzr.log.ext
If that file needs a merge calculated, it will be marked M, even if the output of the merge calculation is identical to the file on disk.
Not to suggest this isn't a bug, but that's the likely explanation.
Aaron -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFIZPe60F+nu1YWqI0RAqhhAJ9iYKOGRvw0OLZrBwXFl/rYjUvmfgCff5ag FDEWaRj73rZuz/Hg7cR2kfY= =UTEG -----END PGP SIGNATURE-----
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Markus Korn wrote: launchpadlibrar ian.net/ 15632683/ bzr.log. ext
> ** Attachment added: "bzr.log.ext"
> http://
If that file needs a merge calculated, it will be marked M, even if the
output of the merge calculation is identical to the file on disk.
Not to suggest this isn't a bug, but that's the likely explanation.
Aaron enigmail. mozdev. org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://
iD8DBQFIZPe60F+ nu1YWqI0RAqhhAJ 9iYKOGRvw0OLZrB wXFl/rYjUvmfgCf f5ag Hg7cR2kfY=
FDEWaRj73rZuz/
=UTEG
-----END PGP SIGNATURE-----