[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 2cfed4124b9c069d96759daa3d5317a887ec
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 2cfed4124b9c069d96759daa3d5317a887ecffb5 |
Date: |
Sat, 29 Sep 2007 17:05:20 +0200 |
-----------------------------------------------------------------
Revision: 2cfed4124b9c069d96759daa3d5317a887ecffb5
Ancestor: 465ec6239f6c327b5fe40f36888bf289fba88936
Author: Ralf S. Engelschall <address@hidden>
Date: 2007-09-23T07:40:26
Branch: net.venge.monotone
Modified files:
std_hooks.lua
ChangeLog:
diff3 return 0 on no conflicts (should not happen in this context) and 1 on
conflicts (which is what we expect here) and 2 on error, so fail on 2 only;
additionally require diff(1) in PATH for sdiff(1) call
monotone --db={your.database} diff
--revision=465ec6239f6c327b5fe40f36888bf289fba88936
--revision=2cfed4124b9c069d96759daa3d5317a887ecffb5
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 2cfed4124b9c069d96759daa3d5317a887ecffb5,
monotone <=