diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-09-02 10:00:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-02 10:00:18 -0700 |
| commit | 96b7c4deb8152cbc6a90c6d26ad6869b45a51e9b (patch) | |
| tree | 2fdbf47d2d2cfa75a392bee07e0c6d22711441c6 /t/t4013/diff.diff-tree_--root_initial | |
| parent | git-svn: Teach dcommit --mergeinfo to handle multiple lines (diff) | |
| parent | merge-recursive: Don't re-sort a list whose order we depend upon (diff) | |
| download | tgif-96b7c4deb8152cbc6a90c6d26ad6869b45a51e9b.tar.xz | |
Merge branch 'en/merge-recursive-2'
* en/merge-recursive-2: (57 commits)
merge-recursive: Don't re-sort a list whose order we depend upon
merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest
t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify
merge-recursive: Avoid unnecessary file rewrites
t6022: Additional tests checking for unnecessary updates of files
merge-recursive: Fix spurious 'refusing to lose untracked file...' messages
t6022: Add testcase for spurious "refusing to lose untracked" messages
t3030: fix accidental success in symlink rename
merge-recursive: Fix working copy handling for rename/rename/add/add
merge-recursive: add handling for rename/rename/add-dest/add-dest
merge-recursive: Have conflict_rename_delete reuse modify/delete code
merge-recursive: Make modify/delete handling code reusable
merge-recursive: Consider modifications in rename/rename(2to1) conflicts
merge-recursive: Create function for merging with branchname:file markers
merge-recursive: Record more data needed for merging with dual renames
merge-recursive: Defer rename/rename(2to1) handling until process_entry
merge-recursive: Small cleanups for conflict_rename_rename_1to2
merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
merge-recursive: Introduce a merge_file convenience function
merge-recursive: Fix modify/delete resolution in the recursive case
...
Diffstat (limited to 't/t4013/diff.diff-tree_--root_initial')
0 files changed, 0 insertions, 0 deletions