[Monotone-commits-diffs] Revision 65235b660e96b3c5f41cca142ab93f97c7178796

[monotone]

-----------------------------------------------------------------
Revision: 65235b660e96b3c5f41cca142ab93f97c7178796
Ancestor: 5475d4cba773600738c6c404b8fda7b0aa05f907
Ancestor: cf554a6d9cbed5b6b61d92ca704f063d063db59d
Author: Timothy Brownawell  <address@hidden>
Date: 2009-03-15T22:13:08
Branch: net.venge.monotone

Modified files:
        INSTALL NEWS cmd_conflicts.cc cmd_ws_commit.cc m4/library.m4
        merge_conflict.cc monotone.texi project.cc
        tests/commit_with_--message-file/__driver__.lua

ChangeLog: 

merge of '5475d4cba773600738c6c404b8fda7b0aa05f907'
     and 'cf554a6d9cbed5b6b61d92ca704f063d063db59d'


monotone --db={your.database} diff 
--revision=5475d4cba773600738c6c404b8fda7b0aa05f907 
--revision=65235b660e96b3c5f41cca142ab93f97c7178796
monotone --db={your.database} diff 
--revision=cf554a6d9cbed5b6b61d92ca704f063d063db59d 
--revision=65235b660e96b3c5f41cca142ab93f97c7178796
----------------------------------------------------------------------