diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:47:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:47:26 -0700 |
| commit | 13a39e2d865cbc8e1f6d6b71f54b7e4fdfd054a3 (patch) | |
| tree | c876ed9284f86e8eb2ec64c364b6009cab3f871d /ll-merge.c | |
| parent | Merge branch 'jn/test-terminal-punt-on-osx-breakage' into maint (diff) | |
| parent | mergetool-lib: call vim in readonly mode for diffs (diff) | |
| download | tgif-13a39e2d865cbc8e1f6d6b71f54b7e4fdfd054a3.tar.xz | |
Merge branch 'mg/maint-difftool-vim-readonly' into maint
* mg/maint-difftool-vim-readonly:
mergetool-lib: call vim in readonly mode for diffs
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions