X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/c920531e512b1776d3698fd05755f8791b3be831..8c737ba4564389ca40f2309e299f37ed1fb79249:/ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 5b7e9d6..ad9105b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
 2005-07-11  Catalin Marinas  <catalin.marinas@gmail.com>
 
+	* gitmergeonefile.py: Fix the os.rename exception occurring when
+	the checkout directory is not present
+
 	* stgit/main.py (export): Add --template option to use a different
 	file as the export template rather than the default one
+	(delete): Check for local changes only of the current patch is
+	removed
 
 2005-07-09  Catalin Marinas  <catalin.marinas@gmail.com>