diff: Fixed retr seequence when given local + remote diffs