diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-07 23:52:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-07 23:52:40 -0700 |
| commit | 640ee0d1cd771bf6093602f1beb143d356607446 (patch) | |
| tree | 4beb1f02eadd8fbb8957078ca6c4684e1bb78fb7 /builtin-count-objects.c | |
| parent | Merge branch 'maint' (diff) | |
| parent | Fix switching to a branch with D/F when current branch has file D. (diff) | |
| download | git-640ee0d1cd771bf6093602f1beb143d356607446.tar.gz git-640ee0d1cd771bf6093602f1beb143d356607446.zip | |
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
Diffstat (limited to 'builtin-count-objects.c')
0 files changed, 0 insertions, 0 deletions