diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-09-02 13:24:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-02 13:24:05 -0700 |
| commit | e8e4ce72cd9ebb5e5dfe580f98b7764ca6dc08ea (patch) | |
| tree | 667ad8fcbe657359f7041f62b9371fbc0b6f3516 /t/t6037-merge-ours-theirs.sh | |
| parent | Merge branch 'mm/config-edit-global' (diff) | |
| parent | init: avoid superfluous real_path() calls (diff) | |
| download | tgif-e8e4ce72cd9ebb5e5dfe580f98b7764ca6dc08ea.tar.xz | |
Merge branch 'rs/init-no-duplicate-real-path'
* rs/init-no-duplicate-real-path:
init: avoid superfluous real_path() calls
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions