What we did at UBZ

[James Blackwell]

> Aaron:
> If it's a merge, you won't be able to pull.


Of course... this is all a moot point if merge and pull are the same
command. The user wouldn't be the wiser. :)

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051121/946ea6d1/attachment.pgp