--- a/mercurial/simplemerge.py Fri Jan 06 16:16:58 2012 +0100
+++ b/mercurial/simplemerge.py Fri Jan 06 16:27:13 2012 +0100
@@ -11,8 +11,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
# mbp: "you know that thing where cvs gives you conflict markers?"
# s: "i hate that."