diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-02-05 14:54:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-05 14:54:17 -0800 |
| commit | 081363dde231346c2f051cd7d41622f6fa02e3cb (patch) | |
| tree | b2d9959ba9a2cd8d463113867d30d96ba48d2d05 /Documentation/merge-strategies.txt | |
| parent | Merge branch 'pw/completion-stash' into maint (diff) | |
| parent | completion: complete "diff --word-diff-regex=" (diff) | |
| download | tgif-081363dde231346c2f051cd7d41622f6fa02e3cb.tar.xz | |
Merge branch 'tb/complete-word-diff-regex' into maint
* tb/complete-word-diff-regex:
completion: complete "diff --word-diff-regex="
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions