| author | Jeff King <peff@peff.net> |
|---|---|
| Wed, 30 Apr 2008 17:23:55 +0000 (13:23 -0400) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Sat, 3 May 2008 20:39:51 +0000 (13:39 -0700) | |
| commit | 2a2ac92...547bc4fa91fcd1cb741dd5691ba9b974 |
| tree | 823a7d5...00be5218581c7eabec25ef2bd605f0e8 (tree) |
| parent | ec84569...c4e6d7b689c3eb0b53d1b2ba4803c7ea (diff) |
| Documentation/merge-config.txt | diff | blob | history | |
| builtin-merge-recursive.c | diff | blob | history | |
| t/t6032-merge-large-rename.sh | [new file with mode: 0755] | blob |