monotone-commits-diffs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] Revision 3927077002a64e0c826af31bf44dfe37fe409e

From: monotone
Subject: [Monotone-commits-diffs] Revision 3927077002a64e0c826af31bf44dfe37fe409ec4
Date: Thu, 1 Jul 2010 05:40:42 +0200 
-----------------------------------------------------------------
Revision: 3927077002a64e0c826af31bf44dfe37fe409ec4
Ancestor: 7438f4d302f9bed11d1a5b3aa9e86de3d601f307
Author: Timothy Brownawell  <address@hidden>
Date: 07/01/10 05:28:04
Branch: net.venge.monotone.options

Modified files:
        cmd_merging.cc merge_conflict.cc options_list.hh

ChangeLog: 

Make --resolve-conflicts and --resolve-conflicts-file separate options instead 
of mutually exclusive.

Attachment: txtlKLLRtYgrN.txt
Description: Diff [7438f4d302f9bed11d1a5b3aa9e86de3d601f307] -> [3927077002a64e0c826af31bf44dfe37fe409ec4]

reply via email to
[Prev in Thread] Current Thread [Next in Thread]