|
| From: | Wim Oudshoorn |
| Subject: | [Monotone-devel] Re: Merging outside monotone? |
| Date: | Mon, 10 Oct 2005 07:09:47 +0200 |
| User-agent: | Gnus/5.1002 (Gnus v5.10.2) Emacs/22.0.50 (darwin) |
"Matthew A. Nicholson" <address@hidden> writes: > I have always like the way monotone handles merging vs CVS. I always > hated cvs just dumping unmerged files all over the place. Also I like > the ability to use vimdiff to merge my files. I don't think this is a > bad option to have as long as it does not interfere with the current > behavior. Oh, definitely would see it as additional behaviour. I don't mind if the command line to achieve that is slightly tricky. Wim Oudshoorn.
| [Prev in Thread] | Current Thread | [Next in Thread] |