-----------------------------------------------------------------
Revision: f9c2a564a6fa60614c12de406acf2c6414a6afae
Ancestor: 248f9501b16b789a01bee914ad5fedf307fd570c
Author: [email protected]
Date: 2010-04-21 15.24.33
Branch: net.venge.monotone
Modified files:
options_list.hh
ChangeLog:
* options_list.hh (OPT move-conflicting-paths): moves into _MTN/resolutions,
not conflicts.
monotone --db={your.database} diff
--revision=248f9501b16b789a01bee914ad5fedf307fd570c
--revision=f9c2a564a6fa60614c12de406acf2c6414a6afae
----------------------------------------------------------------------
_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs
