diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:43:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:43:43 -0700 |
| commit | 460645a8c331196c3e5e61de4acf3f9c5803e335 (patch) | |
| tree | ea40e43d2d844ec5fd455d0ba41a3c67bb6bf390 /contrib/persistent-https | |
| parent | Merge branch 'jc/maint-doc-em-dash' (diff) | |
| parent | t7606: Avoid using head as a file name (diff) | |
| download | git-460645a8c331196c3e5e61de4acf3f9c5803e335.tar.gz git-460645a8c331196c3e5e61de4acf3f9c5803e335.zip | |
Merge branch 'jn/merge-custom-no-trivial'
* jn/merge-custom-no-trivial:
t7606: Avoid using head as a file name
merge: let custom strategies intervene in trivial merges
t7606 (merge-theirs): modernize style
Diffstat (limited to 'contrib/persistent-https')
0 files changed, 0 insertions, 0 deletions