| commit | 990579c470981ee5c354778445adde52cbe1cd78 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 25 Feb 2011 20:14:23 +0000 (25 12:14 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 25 Feb 2011 20:14:23 +0000 (25 12:14 -0800) | ||
| tree | 586bc5b9d575c22d3e46812e4b74ab74475ff09a | treesnapshot (tar.gz zip) |
| parent | 426d48db1a78ffd5f2b882725c32f266e617529e | commitdiff |
| parent | 853c0ffe42fef0bd1abd5cc69d5e93fdd5a708aa | commitdiff |
Merge branch 'mg/maint-difftool-vim-readonly' into next
* mg/maint-difftool-vim-readonly:
mergetool-lib: call vim in readonly mode for diffs
* mg/maint-difftool-vim-readonly:
mergetool-lib: call vim in readonly mode for diffs