-----------------------------------------------------------------
Revision: a1e31e94d1116f5aff25b552cafa9eb64949cd24
Ancestor: 093bc18e9e2bb5187f4bf6177ecaafd69b1359ae
Ancestor: 4dd362d9415592fa494dc59c5ce22b3ee1cfb5fb
Author: Richard Levitte <[email protected]>
Date: 2009-08-24T11:38:31
Branch: net.venge.monotone
Added files:
tests/resolve_conflicts_orphaned_file/__driver__.lua
Added directories:
tests/resolve_conflicts_orphaned_file
Modified files:
NEWS cmd_conflicts.cc merge_conflict.cc merge_content.cc
merge_roster.cc merge_roster.hh monotone.texi
options_list.hh po/sv.po
tests/resolve_conflicts_all_resolutions/conflicts-resolved
tests/resolve_conflicts_content/conflicts-2
tests/resolve_conflicts_read_all/missing-root_left
tests/resolve_conflicts_read_all/missing-root_right
tests/resolve_conflicts_read_all/orphaned-add_left
tests/resolve_conflicts_read_all/orphaned-add_right
tests/resolve_conflicts_read_all/orphaned-rename_left
tests/resolve_conflicts_read_all/orphaned-rename_right
tests/ssh_agent/__driver__.lua
ChangeLog:
merge of '093bc18e9e2bb5187f4bf6177ecaafd69b1359ae'
and '4dd362d9415592fa494dc59c5ce22b3ee1cfb5fb'
monotone --db={your.database} diff
--revision=093bc18e9e2bb5187f4bf6177ecaafd69b1359ae
--revision=a1e31e94d1116f5aff25b552cafa9eb64949cd24
monotone --db={your.database} diff
--revision=4dd362d9415592fa494dc59c5ce22b3ee1cfb5fb
--revision=a1e31e94d1116f5aff25b552cafa9eb64949cd24
----------------------------------------------------------------------
_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs
