[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 8fb58caca4fa27408211c789f84c96c88175
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 8fb58caca4fa27408211c789f84c96c881755013 |
Date: |
Sun, 4 Feb 2007 23:05:02 +0100 |
-----------------------------------------------------------------
Revision: 8fb58caca4fa27408211c789f84c96c881755013
Ancestor: db529ea781a463954dbb9e936dede30d3721f113
Author: Ralf S. Engelschall <address@hidden>
Date: 2007-02-04T22:03:44
Branch: net.venge.monotone
Modified files:
ChangeLog mtn.1 std_hooks.lua
ChangeLog:
2007-02-04 Ralf S. Engelschall <address@hidden>
(via Richard Levitte <address@hidden>)
* mtn.1: Fix two typos.
* std_hooks.lua: Add support for a "last resort" merging via GNU
diffutils' diff3/sdiff (it first shows the 3-way diff via diff3
and then allows interactive 2-way merging via sdiff -- a little
bit similar to what the FreeBSD mergemaster script does).
monotone --db={your.database} diff
--revision=db529ea781a463954dbb9e936dede30d3721f113
--revision=8fb58caca4fa27408211c789f84c96c881755013
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 8fb58caca4fa27408211c789f84c96c881755013,
monotone <=