diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-17 15:11:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 15:11:05 -0800 |
| commit | 6d1f93acfa79568ff60633ff09aa752f43cf8f5f (patch) | |
| tree | 9a9ac6be36c6e8001a8f6457395195a0a7f261a4 /replace_object.c | |
| parent | e4ec4089883c9076744561863f9913bdefec06cf (diff) | |
| parent | 6cf5f6cef7825ba73b3be0b2a2b381079d713bd1 (diff) | |
| download | git-6d1f93acfa79568ff60633ff09aa752f43cf8f5f.tar.gz git-6d1f93acfa79568ff60633ff09aa752f43cf8f5f.zip | |
Merge branch 'da/mergetool-xxdiff-hotkey' into maint
The way to specify hotkeys to "xxdiff" that is used by "git
mergetool" has been modernized to match recent versions of xxdiff.
* da/mergetool-xxdiff-hotkey:
mergetools: fix xxdiff hotkeys
Diffstat (limited to 'replace_object.c')
0 files changed, 0 insertions, 0 deletions