diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-11 23:20:14 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:38 -0700 |
| commit | a99b7f2256ebd2d1db59c578f3da003e36f259c4 (patch) | |
| tree | e109f90e74a5a95b38f965e28a41044ac07536f4 /t/t4013/diff.format-patch_--inline_--stdout_initial..master | |
| parent | merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base (diff) | |
| download | git-a99b7f2256ebd2d1db59c578f3da003e36f259c4.tar.gz git-a99b7f2256ebd2d1db59c578f3da003e36f259c4.zip | |
merge-recursive: Small cleanups for conflict_rename_rename_1to2
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..master')
0 files changed, 0 insertions, 0 deletions