Eli Zaretskii wrote: > If I merge only specific files, as in > > bzr merge ../other-branch/foo > > does this also count as cherry-picking? That is, does Bazaar track > such merges in the history, or doesn't it? It doesn't. -Andrew.