monotone-commits-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] Revision f5b65f64715a454e2c0d6b57cd8afab3a10a2d


From: monotone
Subject: [Monotone-commits-diffs] Revision f5b65f64715a454e2c0d6b57cd8afab3a10a2db0
Date: Sat, 29 Sep 2007 17:05:20 +0200

-----------------------------------------------------------------
Revision: f5b65f64715a454e2c0d6b57cd8afab3a10a2db0
Ancestor: 2cfed4124b9c069d96759daa3d5317a887ecffb5
Author: Ralf S. Engelschall <address@hidden>
Date: 2007-09-23T10:41:02
Branch: net.venge.monotone

Modified files:
        std_hooks.lua

ChangeLog: 

Improve "diffutils" merger:

- add header lines in interactive mode to be easier to understand what
  is just the summary display and what is the conflict resolution part

- use --show-overlap to not mark the non-conflicting parts

- add support for MTN_MERGE_DIFFUTILS=partial which does the
  3-way merge but keeps conflicts marked. This is especially useful in
  combination with "mtn merge_into_workspace" and this way resembles the
  "cvs update" and "svn update" operations under conflict situations.
  This especially obsoletes contrib/diff3_keep_conflicts_merger.lua.

- reformat source for consistent indentation

Attachment: txtneYF3KSZ7O.txt
Description: Diff [2cfed4124b9c069d96759daa3d5317a887ecffb5] -> [f5b65f64715a454e2c0d6b57cd8afab3a10a2db0]


reply via email to

[Prev in Thread] Current Thread [Next in Thread]