-
Committer:
Martin Pool
-
Date:
2007-02-25 10:51:25 UTC
-
mto:
This revision was merged to the branch mainline in
revision
2309.
-
Revision ID:
mbp@sourcefrog.net-20070225105125-32o9nqxk062ncix0
Push and pull operations now merge tags and report conflicts in their result