[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 21ee0754448a471cc15bb4687e07d79edadd
|
From: |
monotone |
|
Subject: |
[Monotone-commits-nodiffs] Revision 21ee0754448a471cc15bb4687e07d79edadde39e |
|
Date: |
Sun, 16 May 2010 19:47:48 +0200 |
-----------------------------------------------------------------
Revision: 21ee0754448a471cc15bb4687e07d79edadde39e
Ancestor: 2e8025719b9f8fecbdac6247974da09a507a2c34
Author: Timothy Brownawell <address@hidden>
Date: 05/11/10 01:22:51
Branch: net.venge.monotone.bugfest-2010.17878-tbrownaw
Modified files:
maybe_workspace_updater.cc
tests/resolve_conflicts_all_resolutions/merge-1
tests/resolve_conflicts_content/merge-1
tests/resolve_conflicts_duplicate_name/merge-1
tests/resolve_conflicts_none/merge-1
tests/resolve_conflicts_propagate/propagate-1
tests/resolve_conflicts_propagate/propagate-2
ChangeLog:
Message when not updating the workspace should not be plural.
monotone --db={your.database} diff
--revision=2e8025719b9f8fecbdac6247974da09a507a2c34
--revision=21ee0754448a471cc15bb4687e07d79edadde39e
----------------------------------------------------------------------