projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjust code from manual merges
[ghc-hetmet.git]
/
.darcs-boring
diff --git
a/.darcs-boring
b/.darcs-boring
index
b43be2a
..
89d4b8a
100644
(file)
--- a/
.darcs-boring
+++ b/
.darcs-boring
@@
-107,7
+107,7
@@
^compiler/cmm/CmmLex.hs$
^compiler/cmm/CmmParse.hs$
^compiler/main/Config.hs$
^compiler/cmm/CmmLex.hs$
^compiler/cmm/CmmParse.hs$
^compiler/main/Config.hs$
-^compiler/parser/ParsePkgConf.hs$
+^compiler/main/ParsePkgConf.hs$
^compiler/parser/Parser.y$
^compiler/parser/Parser.hs$
^compiler/parser/Lexer.hs$
^compiler/parser/Parser.y$
^compiler/parser/Parser.hs$
^compiler/parser/Lexer.hs$
@@
-129,3
+129,4
@@
package.conf.installed$
(^|/)config.status$
(^|/)configure$
^ghc.spec$
(^|/)config.status$
(^|/)configure$
^ghc.spec$
+^docs/users_guide/ug-book.xml$