From: Russ Cox <rsc@golang.org>
Date: Mon, 9 Dec 2013 23:40:54 +0000 (-0500)
Subject: .hgignore: ignore liblink/anames?.c
X-Git-Tag: go1.3beta1~1290
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=dba4d11e0809547296e051ce58eb04ab10e549da;p=gostls13.git

.hgignore: ignore liblink/anames?.c

R=golang-dev, minux.ma, iant
CC=golang-dev
https://golang.org/cl/36300045
---

diff --git a/.hgignore b/.hgignore
index 2f11d9c233..69141f86a6 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