aboutsummaryrefslogtreecommitdiff
path: root/libphobos/src
diff options
context:
space:
mode:
authorJohannes Pfau <jpfau@gcc.gnu.org>2019-03-23 15:07:16 +0000
committerJohannes Pfau <jpfau@gcc.gnu.org>2019-03-23 15:07:16 +0000
commit686e44763e7bdb1ee1561bc91ce65661d28f3e65 (patch)
treeddd47687f8f99855abea8f1e8e016b8add222cc7 /libphobos/src
parente6b853501ba25b09edb5c6adf6ffc59a1ceea941 (diff)
downloadgcc-686e44763e7bdb1ee1561bc91ce65661d28f3e65.zip
gcc-686e44763e7bdb1ee1561bc91ce65661d28f3e65.tar.gz
gcc-686e44763e7bdb1ee1561bc91ce65661d28f3e65.tar.bz2
[libphobos] Update MERGE file, remove ill-formatted changelog entry
Changelog entries are not required for upstream merges. From-SVN: r269887
Diffstat (limited to 'libphobos/src')
-rw-r--r--libphobos/src/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/libphobos/src/MERGE b/libphobos/src/MERGE
index 61c4252..63bd468 100644
--- a/libphobos/src/MERGE
+++ b/libphobos/src/MERGE
@@ -1,4 +1,4 @@
-791c5d2407e500bb4e777d6a90fc96cf250ba2f6
+ef07932811de50a1d5810ea23462d127a60574a6
The first line of this file holds the git revision number of the last
merge done from the dlang/phobos repository.