summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-11-21 14:05:32 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-11-21 14:05:32 +0900
commitb2a276830fa6266469dcc50107bdee02a9daa33b (patch)
tree3b87f229fa5f08afd24dfac07edbd0c4a7a056ff /t
parentMerge branch 'ad/rebase-i-serie-typofix' into maint (diff)
parentMerge branch 'tz/fsf-address-update' of ../git-gui into tz/fsf-address-update (diff)
downloadtgif-b2a276830fa6266469dcc50107bdee02a9daa33b.tar.xz
Merge branch 'tz/fsf-address-update' into maint
Replace the mailing address of FSF to a URL, as FSF prefers. * tz/fsf-address-update: Replace Free Software Foundation address in license notices Replace Free Software Foundation address in license notices
Diffstat (limited to 't')
-rwxr-xr-xt/t9114-git-svn-dcommit-merge.sh4
1 files changed, 1 insertions, 3 deletions
diff --git a/t/t9114-git-svn-dcommit-merge.sh b/t/t9114-git-svn-dcommit-merge.sh
index a3d388228a..50bca62def 100755
--- a/t/t9114-git-svn-dcommit-merge.sh
+++ b/t/t9114-git-svn-dcommit-merge.sh
@@ -27,9 +27,7 @@ cat << EOF
# 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/>.
#
EOF
}