Mercurial > public > mercurial-scm > hg

comparison mercurial/simplemerge.py @ 15782:7de7630053cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove FSF mailing address from GPL headers The GPLv3 FAQ suggests to upgrade by [...] replace all your existing v2 license notices (usually at the top of each file) with the new recommended text available on the GNU licenses howto. It's more future-proof because it no longer includes the FSF's postal mailing address. This removes the postal address, but leaves the version number at 2+.
author Martin Geisler <mg@aragost.com>
date Fri, 06 Jan 2012 16:27:13 +0100
parents c519cd8f0169
children 525fdb738975
comparison
equal deleted inserted replaced
15781:cc2da4a5ed9a 15782:7de7630053cb
9 # but WITHOUT ANY WARRANTY; without even the implied warranty of 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # GNU General Public License for more details. 11 # GNU General Public License for more details.
12 # 12 #
13 # You should have received a copy of the GNU General Public License 13 # You should have received a copy of the GNU General Public License
14 # along with this program; if not, write to the Free Software 14 # along with this program; if not, see <http://www.gnu.org/licenses/>.
15 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16 15
17 # mbp: "you know that thing where cvs gives you conflict markers?" 16 # mbp: "you know that thing where cvs gives you conflict markers?"
18 # s: "i hate that." 17 # s: "i hate that."
19 18
20 from i18n import _ 19 from i18n import _