traverse_trees(): handle D/F conflict case sanely

diff --git a/diff-lib.c b/diff-lib.c
index 0c74ef5cbe9ae0b43d8eaeb3249e4f83c695920b..adf1c5fdee2bc836f03eaa89160573973bb46a67 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -383,7 +383,7 @@ static inline void skip_same_name(struct cache_entry *ce, struct unpack_trees_op
  * For diffing, the index is more important, and we only have a
  * single tree.
  *
- * We're supposed to return how many index entries we want to skip.
+ * We're supposed to advance o->pos to skip what we have already processed.
  *
  * This wrapper makes it all more readable, and takes care of all
  * the fairly complex unpack_trees() semantic requirements, including