diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-03-28 13:52:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-28 13:52:27 -0700 |
| commit | 1c91ec0b8ea750584b4657b9a38413e02b3956ad (patch) | |
| tree | 261ea924ccae8650991f16b21c1ca1cd30131511 /builtin/merge-ours.c | |
| parent | Merge branch 'rs/http-push-cleanup' into maint (diff) | |
| parent | revision: remove declaration of path_name() (diff) | |
| download | tgif-1c91ec0b8ea750584b4657b9a38413e02b3956ad.tar.xz | |
Merge branch 'rs/path-name-safety-cleanup' into maint
Code clean-up.
* rs/path-name-safety-cleanup:
revision: remove declaration of path_name()
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions