diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:21:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:21:35 -0700 |
| commit | a52fb9b8f3e30b5b5e743cae91c3b2e1f729eb5d (patch) | |
| tree | e095fccfca6cd9d67981a5672f7f7df5629ad9cf /xdiff/xpatience.c | |
| parent | Merge branch 'jk/push-scrub-url' into maint (diff) | |
| parent | diff: fix a double off-by-one with --ignore-space-at-eol (diff) | |
| download | tgif-a52fb9b8f3e30b5b5e743cae91c3b2e1f729eb5d.tar.xz | |
Merge branch 'js/ignore-space-at-eol' into maint
An age old bug that caused "git diff --ignore-space-at-eol"
misbehave has been fixed.
* js/ignore-space-at-eol:
diff: fix a double off-by-one with --ignore-space-at-eol
diff: demonstrate a bug with --patience and --ignore-space-at-eol
Diffstat (limited to 'xdiff/xpatience.c')
| -rw-r--r-- | xdiff/xpatience.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xdiff/xpatience.c b/xdiff/xpatience.c index 04e1a1ab2a..a613efc703 100644 --- a/xdiff/xpatience.c +++ b/xdiff/xpatience.c @@ -1,6 +1,6 @@ /* * LibXDiff by Davide Libenzi ( File Differential Library ) - * Copyright (C) 2003-2009 Davide Libenzi, Johannes E. Schindelin + * Copyright (C) 2003-2016 Davide Libenzi, Johannes E. Schindelin * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public |