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 /ChangeLog | |
| 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 'ChangeLog')
| -rw-r--r-- | ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 6da23d08e..475539651 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-08-24 Clint Adams <clint@zsh.org> + + * 25521: Completion/Unix/Command/_git: get merge strategies from + git merge in case the administrator has added custom strategies. + 2008-08-22 Peter Stephenson <pws@csr.com> * 25508: Src/exec.c: set file name if function came from |