Aaron Bentley wrote:
> Christopher Armstrong wrote:
>> Just to be clear—my impression is that there are cases where the diff
>> given while merging a branch into another branch is different from
>> anything you can easily do with "diff" without "merge", right?
>
> Not really. As long as you specify the correct revision, you can
> generate an identical merge.
I mean "identical diff", obviously.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Aaron Bentley wrote:
> Christopher Armstrong wrote:
>> Just to be clear—my impression is that there are cases where the diff
>> given while merging a branch into another branch is different from
>> anything you can easily do with "diff" without "merge", right?
>
> Not really. As long as you specify the correct revision, you can
> generate an identical merge.
I mean "identical diff", obviously.
Aaron enigmail. mozdev. org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://
iD8DBQFGUymv0F+ nu1YWqI0RAljkAJ 9oF43Mu2UWxqVdP 8J5qr4DjQfCgQCf Yv9e 1KlTY3sY=
SL4rmHvsVNJzxNK
=jVid
-----END PGP SIGNATURE-----