diff options
| author | Elijah Newren <newren@gmail.com> | 2010-08-17 17:53:18 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 12:08:05 -0700 |
| commit | 5601ba6574cfbd1249a6d38b72159a7d3ccf8315 (patch) | |
| tree | de3761e7c4eeb430f8ca391873c83e9ce8e79007 /merge-recursive.c | |
| parent | a3e413675478585206966bdbb7fd7bf24b9d1ea7 (diff) | |
| download | git-5601ba6574cfbd1249a6d38b72159a7d3ccf8315.tar.gz git-5601ba6574cfbd1249a6d38b72159a7d3ccf8315.tar.xz | |
t6031: Add a testcase covering multiple renames across a D/F conflict
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions