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/t4041-diff-submodule-option.sh | |
| parent | b8939b2b3abaa99c18bf57251cd2828b89ac38c5 (diff) | |
| parent | d387868a7d29621e85e8c5c061d1f50586db74e5 (diff) | |
| download | git-b52ab19d91015ebd6bebc83a82b2c3d64b948b36.tar.gz git-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/t4041-diff-submodule-option.sh')
0 files changed, 0 insertions, 0 deletions