summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2013-12-09 18:40:54 -0500
committerRuss Cox <rsc@golang.org>2013-12-09 18:40:54 -0500
commit8e3ed6b742a3e459bcc655ae4c5b10c3867c6866 (patch)
treef888e89458a620d699a5b77a0079fed0f315842a
parentbc034b7d63040f413568495b7f82dd509b0d9e18 (diff)
downloadgo-8e3ed6b742a3e459bcc655ae4c5b10c3867c6866.tar.gz
.hgignore: ignore liblink/anames?.c
R=golang-dev, minux.ma, iant CC=golang-dev https://codereview.appspot.com/36300045
-rw-r--r--.hgignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 2f11d9c23..69141f86a 100644
--- a/.hgignore
+++ b/.hgignore
@@ -33,7 +33,10 @@ misc/goplay/goplay
misc/osx/*.pkg
misc/osx/*.dmg
src/cmd/?a/y.output
+<<<<<<< local
+=======
src/liblink/anames?.c
+>>>>>>> other
src/cmd/cc/y.output
src/cmd/cgo/zdefaultcc.go
src/cmd/dist/dist.dSYM
@@ -41,6 +44,7 @@ src/cmd/gc/mkbuiltin1
src/cmd/gc/opnames.h
src/cmd/gc/y.output
src/cmd/go/zdefaultcc.go
+src/liblink/anames?.c
src/pkg/go/doc/headscan
src/pkg/runtime/goc2c
src/pkg/runtime/mkversion