diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-27 22:01:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-27 22:01:01 -0700 |
| commit | aab9ea1aad2447522928d7e9af0bb030558012cb (patch) | |
| tree | 4bc083ee1927d43398a3d51c58f9c030ce15a06f /git-mergetool--lib.sh | |
| parent | 106a36509dc78e32e0b0e64c8da12ace639c879a (diff) | |
| parent | 749086fa090d81c10ebf16b1abfd138c3fa0232e (diff) | |
| download | git-aab9ea1aad2447522928d7e9af0bb030558012cb.tar.gz | |
Merge branch 'maint'
* maint:
Fix overridable written with an extra 'e'
Documentation: git-archive: mark --format as optional in summary
Round-down years in "years+months" relative date view
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions