|
From: | Stefan Monnier |
Subject: | [Gnu-arch-users] star-merge vs apply-delta (was: [MERGE REQUEST: lord] documentation and help enhancements) |
Date: | 06 May 2004 18:30:33 -0400 |
User-agent: | Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50 |
> A while ago I wanted to be able to specify the common ancestor REVISION to > star-merge, but then realized that apply-delta would do the same job. apply-delta could only do the same job if you're not using --three-way. Stefan "Using --three-way all the way"
[Prev in Thread] | Current Thread | [Next in Thread] |