From: Bdale Garbee <bdale@gag.com>
Date: Wed, 25 Feb 2009 06:14:55 +0000 (-0700)
Subject: Merge branch 'dfsg-orig' into dfsg-debian
X-Git-Url: https://git.cworth.org/git?p=tar;a=commitdiff_plain;h=d3daaa199aca7497bb507f92b693c8457353f96a

Merge branch 'dfsg-orig' into dfsg-debian

Conflicts:
	cleanup-script.sh
	tests/incremental.at
---

d3daaa199aca7497bb507f92b693c8457353f96a
diff --cc cleanup-script.sh
index 39fd20b,684ac91..1fd7d47
--- a/cleanup-script.sh
+++ b/cleanup-script.sh
@@@ -217,4 -218,7 +218,10 @@@ then ${echo} 'x - removed lock director
  else ${echo} 'x - failed to remove lock directory `'${lock_dir}\''.'
    exit 1
  fi
++<<<<<<< HEAD:cleanup-script.sh
++=======
+ 
+ git add doc/Makefile doc/Makefile.in doc/README
+ 
++>>>>>>> c286dbf484dc985fb63d5c677fc8cd91b5b1d0f6:cleanup-script.sh
  exit 0