diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-05-05 21:00:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-05 21:00:32 -0700 |
| commit | ef8163ce57a59b4f494b02d01b3929b5c4488f5e (patch) | |
| tree | dcbf189005e39399d8c7242bcca01abcd8245ddb /Documentation/merge-strategies.txt | |
| parent | Merge branch 'oh/fix-config-default-user-name-section' (diff) | |
| parent | t1509: update prepare script to be able to run t1509 in chroot again (diff) | |
| download | tgif-ef8163ce57a59b4f494b02d01b3929b5c4488f5e.tar.xz | |
Merge branch 'nd/t1509-chroot-test'
Correct test bitrot.
* nd/t1509-chroot-test:
t1509: update prepare script to be able to run t1509 in chroot again
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions