summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJim Meyering <meyering@fb.com>2013-02-07 09:43:41 -0800
committerJim Meyering <jim@meyering.net>2013-02-07 20:02:45 +0100
commit1f1f41db85c559285c9969e1a1a3430a872d0722 (patch)
tree7d7801b6e568dc74199647392019cc8295aa3157 /.mailmap
parent786db9ef54516c56b68495c7c4c64a58a61457b1 (diff)
downloadcoreutils-1f1f41db85c559285c9969e1a1a3430a872d0722.tar.xz
tests: avoid actual/expected mismatch due to changed diagnostic
* tests/cp/fail-perm.sh: Adjust expected diagnostic to match just-changed cp diagnostic. * tests/ln/hard-to-sym.sh: Likewise. * .mailmap: Also map my new address.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 8b6231763..dcabcb534 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,5 @@
# Map git author names and email addresses to canonical/preferred form.
+<jim@meyering.net> <meyering@fb.com>
<jim@meyering.net> <meyering@iou.iou>
<jim@meyering.net> <meyering@redhat.com>
<jim@meyering.net> <meyering@rho.meyering.net>