diff options
| author | Clint Adams <clint@users.sourceforge.net> | 2008-08-24 19:48:09 +0000 |
|---|---|---|
| committer | Clint Adams <clint@users.sourceforge.net> | 2008-08-24 19:48:09 +0000 |
| commit | 9d7298bac8c9c8930fa69e4bffa75fb6d0beb506 (patch) | |
| tree | bd2da92215628f7034c482a11bcd7c76dccbdbec /Src/options.c | |
| parent | 9fe735e663507164a61341c998247328fa2a738b (diff) | |
| download | zsh-9d7298bac8c9c8930fa69e4bffa75fb6d0beb506.tar.gz zsh-9d7298bac8c9c8930fa69e4bffa75fb6d0beb506.tar.xz zsh-9d7298bac8c9c8930fa69e4bffa75fb6d0beb506.zip | |
25521: get merge strategies from git merge in case the administrator has added custom strategies.
Diffstat (limited to 'Src/options.c')
0 files changed, 0 insertions, 0 deletions