At file:///net/bigmamac/Volumes/home/vila/src/bzr/cases/3232-spurious-conflict/
------------------------------------------------------------
revno: 3884
revision-id: [email protected]
parent: [email protected]
committer: Vincent Ladeuil <[email protected]>
branch nick: cleanups
timestamp: Wed 2009-01-14 13:27:02 +0100
message:
Fix typo.
* bzrlib/merge.py:
(Merge3Merger.merge_contents): Fix typo in doc string.
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py 2008-12-11 03:18:52 +0000
+++ b/bzrlib/merge.py 2009-01-14 12:27:02 +0000
@@ -1090,7 +1090,7 @@
parent_trans_id, trans_id)
def merge_contents(self, file_id):
- """Performa a merge on file_id contents."""
+ """Performs a merge on file_id contents."""
def contents_pair(tree):
if file_id not in tree:
return (None, None)
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
