| author | Jiang Xin <worldhello.net@gmail.com> |
|---|---|
| Wed, 25 Jul 2012 14:53:13 +0000 (22:53 +0800) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Fri, 27 Jul 2012 05:34:15 +0000 (22:34 -0700) | |
| commit | 55653a6...9e17cfa896aa0454e751a9002b519f4b |
| tree | 8666b61...1ee3af4a938b49f6f1508fdc2bcce6ad (tree) |
| parent | 31023e0...9fdba7ed6458caf2082dd6d82df6a56c (diff) |
| merge-recursive.c | diff | blob | history | |
| t/t6022-merge-rename.sh | diff | blob | history | |
| t/t6042-merge-rename-corner-cases.sh | diff | blob | history |