From f2c702d3b25bc74dd2867efb82f9b6bb75509d93 Mon Sep 17 00:00:00 2001
From: Ian Beckwith <ianb@erislabs.net>
Date: Sun, 2 Mar 2014 11:15:57 +0000
Subject: [PATCH] tweak git-merge-changelog README

---
 debian/README.git-merge-changelog | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/debian/README.git-merge-changelog b/debian/README.git-merge-changelog
index 61ce6eb8f..e68b69fe1 100644
--- a/debian/README.git-merge-changelog
+++ b/debian/README.git-merge-changelog
@@ -26,19 +26,13 @@
 
 /* Installation:
 
-   $ gnulib-tool --create-testdir --dir=/tmp/testdir123 git-merge-changelog
-   $ cd /tmp/testdir123
-   $ ./configure
-   $ make
-   $ make install
-
-   Additionally, for git users:
+   For git users:
      - Add to .git/config of the checkout (or to your $HOME/.gitconfig) the
        lines
 
           [merge "merge-changelog"]
                   name = GNU-style ChangeLog merge driver
-                  driver = /usr/local/bin/git-merge-changelog %O %A %B
+                  driver = /usr/bin/git-merge-changelog %O %A %B
 
      - In every directory that contains a ChangeLog file, add a file
        '.gitattributes' with this line:
@@ -47,7 +41,7 @@
 
        (See "man 5 gitattributes" for more info.)
 
-   Additionally, for bzr users:
+   For bzr users:
      - Install the 'extmerge' bzr plug-in listed at
          <http://doc.bazaar.canonical.com/plugins/en/index.html>
          <http://wiki.bazaar.canonical.com/BzrPlugins>
@@ -59,14 +53,14 @@
 
           $ bzr extmerge ChangeLog
 
-   Additionally, for hg users:
+   For hg users:
      - Add to your $HOME/.hgrc the lines
 
         [merge-patterns]
         ChangeLog = git-merge-changelog
 
         [merge-tools]
-        git-merge-changelog.executable = /usr/local/bin/git-merge-changelog
+        git-merge-changelog.executable = /usr/bin/git-merge-changelog
         git-merge-changelog.args = $base $local $other
 
        See <http://www.selenic.com/mercurial/hgrc.5.html> section merge-tools
-- 
2.11.0