[Monotone-commits-diffs] Revision 9d015727152d7216760dd01502229e68c0704705

[monotone]

-----------------------------------------------------------------
Revision: 9d015727152d7216760dd01502229e68c0704705
Ancestor: 7b53c25d6b55bbb48bae89d738b95efd67686c62
Author: address@hidden
Date: 2006-01-23T09:23:34
Branch: net.venge.monotone.root-dir-rename

Modified files:
        roster_merge.cc

ChangeLog: 

Teach roster_merge to detect new conflict types.
This code is untested, and the code in roster_merge.cc to get a split_path
  representing the bookkeeping root is totally miserable.

txtPxNDYoQVIW.txt
Description: Diff [7b53c25d6b55bbb48bae89d738b95efd67686c62] -> [9d015727152d7216760dd01502229e68c0704705]