diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-04-02 12:56:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-02 12:56:35 -0700 |
| commit | b52ab19d91015ebd6bebc83a82b2c3d64b948b36 (patch) | |
| tree | 56c03a113b6d6e5597f3e73ece62879c6268da45 /t/t4101/diff.0-2 | |
| parent | string-list: document that string_list_insert() inserts unique strings (diff) | |
| parent | merge: backport GIT_MERGE_AUTOEDIT support (diff) | |
| download | tgif-b52ab19d91015ebd6bebc83a82b2c3d64b948b36.tar.xz | |
Merge branch 'jc/maint-merge-autoedit' into maint
* jc/maint-merge-autoedit:
merge: backport GIT_MERGE_AUTOEDIT support
Diffstat (limited to 't/t4101/diff.0-2')
0 files changed, 0 insertions, 0 deletions