[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] Status of nvm.stripped
|
From: |
Stephen Leake |
|
Subject: |
Re: [Monotone-devel] Status of nvm.stripped |
|
Date: |
Wed, 24 Dec 2008 15:17:35 -0500 |
|
User-agent: |
Gnus/5.11 (Gnus v5.11) Emacs/22.1 (gnu/linux) |
Markus Wanner <address@hidden> writes:
> Or review
> Stephen Leake's work and land that.
If you are refering to the conflicts resolution stuff in
nvm.resolve_conflicts, that has already been merged into main.
That is _not_ the suture stuff in nvm.automate_show_conflict; that
work is on hold indefinitely (ie, until I run into a situation that
really needs it).
--
-- Stephe
- [Monotone-devel] Status of nvm.stripped, Thomas Keller, 2008/12/14
- Re: [Monotone-devel] Status of nvm.stripped, Zack Weinberg, 2008/12/14
- Re: [Monotone-devel] Status of nvm.stripped, Thomas Keller, 2008/12/15
- Re: [Monotone-devel] Status of nvm.stripped, Markus Wanner, 2008/12/21
- Re: [Monotone-devel] Status of nvm.stripped, Thomas Keller, 2008/12/21
- Re: [Monotone-devel] Status of nvm.stripped, Thomas Moschny, 2008/12/22
- Re: [Monotone-devel] Status of nvm.stripped, Markus Wanner, 2008/12/22
- Re: [Monotone-devel] Status of nvm.stripped,
Stephen Leake <=
- Re: [Monotone-devel] Status of nvm.stripped, Markus Wanner, 2008/12/25
Re: [Monotone-devel] Status of nvm.stripped, Jack Lloyd, 2008/12/14
Re: [Monotone-devel] Status of nvm.stripped, Stephen Leake, 2008/12/20