diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-11 16:47:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-11 16:47:34 -0800 |
| commit | b88cb8815879beefce4cfd83261adea728752c25 (patch) | |
| tree | 349790d3486113b6428e4ea339e2d1317cb805c8 /git-merge-resolve.sh | |
| parent | Merge branch 'jn/warn-on-inaccessible-loosen' into maint (diff) | |
| parent | Use longer alias names in subdirectory tests (diff) | |
| download | tgif-b88cb8815879beefce4cfd83261adea728752c25.tar.xz | |
Merge branch 'as/test-name-alias-uniquely' into maint
* as/test-name-alias-uniquely:
Use longer alias names in subdirectory tests
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions