| commit | 640ee0d1cd771bf6093602f1beb143d356607446 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 8 Apr 2007 06:52:40 +0000 (7 23:52 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 8 Apr 2007 06:52:40 +0000 (7 23:52 -0700) | ||
| tree | 4beb1f02eadd8fbb8957078ca6c4684e1bb78fb7 | treesnapshot (tar.gz zip) |
| parent | 5838dffdcbe92bbbf50a29067fd9dc871155d76d | commitdiff |
| parent | c81935348be263de3da085e6ac828b583a85c905 | commitdiff |
Merge branch 'jc/read-tree-df' (early part)
* 'jc/read-tree-df' (early part):
Fix switching to a branch with D/F when current branch has file D.
Fix twoway_merge that passed d/f conflict marker to merged_entry().
Fix read-tree --prefix=dir/.
unpack-trees: get rid of *indpos parameter.
unpack_trees.c: pass unpack_trees_options structure to keep_entry() as well.
add_cache_entry(): removal of file foo does not conflict with foo/bar
* 'jc/read-tree-df' (early part):
Fix switching to a branch with D/F when current branch has file D.
Fix twoway_merge that passed d/f conflict marker to merged_entry().
Fix read-tree --prefix=dir/.
unpack-trees: get rid of *indpos parameter.
unpack_trees.c: pass unpack_trees_options structure to keep_entry() as well.
add_cache_entry(): removal of file foo does not conflict with foo/bar
| builtin-read-tree.c | diff1 | diff2 | blobhistory |
| read-cache.c | diff1 | diff2 | blobhistory |