projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a3e4136) | patch
t6031: Add a testcase covering multiple renames across a D/F conflict
authorElijah Newren <newren@gmail.com>
Tue, 17 Aug 2010 23:53:18 +0000 (17:53 -0600)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 19:08:05 +0000 (12:08 -0700)
commit5601ba6574cfbd1249a6d38b72159a7d3ccf8315
treede3761e7c4eeb430f8ca391873c83e9ce8e79007tree | snapshot
parenta3e413675478585206966bdbb7fd7bf24b9d1ea7commit | diff
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>
t/t6031-merge-recursive.sh diff | blob | history
Git—the stupid content tracker