[Monotone-commits-diffs] Revision 133d7c3ff21229143d27ccd7cca5d64d2b117335

[monotone]

-----------------------------------------------------------------
Revision: 133d7c3ff21229143d27ccd7cca5d64d2b117335
Ancestor: 377b436a1403cb8532372f045a57ee5d26d9bd61
Author: Ralf S. Engelschall <address@hidden>
Date: 2007-09-24T20:36:55
Branch: net.venge.monotone

Modified files:
        std_hooks.lua

ChangeLog: 

Further improve "diffutils" merger:

- remove left-over debugging output

- replace MTN_MERGE_DIFFUTILS "showall" option with a generic "diff3opts"
  which can be used like this MTN_MERGE_DIFFUTILS="partial,diff3opts=-E -O"
  for passing arbitrary flags to diff3(1).

- add "sdiffopts" option for passing arbitrary flags to sdiff(1).

- let diff3(1) default to "--merge [-A]" instead of "--merge -E".

- consistently use gettext() for verbose messages

txtGOVDx55Ddl.txt
Description: Diff [377b436a1403cb8532372f045a57ee5d26d9bd61] -> [133d7c3ff21229143d27ccd7cca5d64d2b117335]