Mike Kupfer <mike.kupfer at sun.com> writes: >>>>>> "Nathan" == Nathan Bush <nathan.bush at sun.com> writes: > > Nathan> It would not be correct to use "-r tip" in a fix for this, since > Nathan> that would ignore working directory changes. > > What about "-r ." ?
Most uses of the '.' revision compare to the first parent of a merge, not the working copy. -- Rich
