diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:36:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:36:22 -0700 |
| commit | e99f8c6dcf0f924f1a7702bdd2d6f50e9fbb8fbb (patch) | |
| tree | 3fed4e38243fb2ed25be9168a7f4c7592a270b41 /t/t6037-merge-ours-theirs.sh | |
| parent | Merge branch 'jc/run-receive-hook-cleanup' (diff) | |
| parent | sha1_file: normalize alt_odb path before comparing and storing (diff) | |
| download | tgif-e99f8c6dcf0f924f1a7702bdd2d6f50e9fbb8fbb.tar.xz | |
Merge branch 'wh/normalize-alt-odb-path'
* wh/normalize-alt-odb-path:
sha1_file: normalize alt_odb path before comparing and storing
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions