am 7fa4a21e
: (-s ours) am 780c2372
: accommodate both new and old target-files when creating incrementals (do not merge)
Merge commit '7fa4a21e1872e5ef2da12f00e77fa459c6c61c1c' * commit '7fa4a21e1872e5ef2da12f00e77fa459c6c61c1c': accommodate both new and old target-files when creating incrementals (do not merge)
This commit is contained in: