diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-03-10 15:25:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-10 15:25:18 -0800 |
| commit | 2e0e8b68e3ba8ea87f001c45c78f9b7ce549c61f (patch) | |
| tree | 12363fe88e40f042c24583e829a696505fcb9b7c /t/t6037-merge-ours-theirs.sh | |
| parent | Update draft release notes to 1.7.1 (diff) | |
| parent | Move 'builtin-*' into a 'builtin/' subdirectory (diff) | |
| download | tgif-2e0e8b68e3ba8ea87f001c45c78f9b7ce549c61f.tar.xz | |
Merge branch 'lt/deepen-builtin-source'
* lt/deepen-builtin-source:
Move 'builtin-*' into a 'builtin/' subdirectory
Conflicts:
Makefile
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions