Mercurial > hg > gcmultimerge

comparison multimerge.py @ 80:4bed40e35fae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix copyright and add information about license.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 13 Jul 2016 13:00:54 +0300
parents 784cac877428
children ce02c0c00e64
comparison
equal deleted inserted replaced
79:0ccf3fd49181 80:4bed40e35fae
1 #!/usr/bin/python 1 #!/usr/bin/python
2 # coding=utf-8 2 # coding=utf-8
3 ### 3 ###
4 ### Google Calendar MultiMerge 4 ### Google Calendar MultiMerge
5 ### (C) 2016 Matti 'ccr' Hamalainen <ccr@tnsp.org> 5 ### Programmed and designed by Matti 'ccr' Hämäläinen <ccr@tnsp.org>
6 ### (C) Copyright 2016 Tecnic Software productions (TNSP)
7 ###
8 ### For license information, see file "COPYING".
6 ### 9 ###
7 ### Python 2.7 <= x < 3 required! Please refer to 10 ### Python 2.7 <= x < 3 required! Please refer to
8 ### README.txt for information on other depencies. 11 ### README.txt for information on other depencies.
9 ### 12 ###
10 import os 13 import os