diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:46 -0800 |
| commit | 292e53fa9d2cf6d0b6d6adbbdc6dfc665bd4babe (patch) | |
| tree | c6cf86a42e4386b3c37bd23903c672669e8e8bdf /merge.c | |
| parent | Merge branch 'bc/svn-hash-oid-fix' (diff) | |
| parent | userdiff: support Bash (diff) | |
| download | tgif-292e53fa9d2cf6d0b6d6adbbdc6dfc665bd4babe.tar.xz | |
Merge branch 've/userdiff-bash'
The userdiff pattern learned to identify the function definition in
POSIX shells and bash.
* ve/userdiff-bash:
userdiff: support Bash
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions