X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/blobdiff_plain/8c737ba4564389ca40f2309e299f37ed1fb79249..cfafb9451a0a0704af4eea997ec91df83bf9e720:/ChangeLog diff --git a/ChangeLog b/ChangeLog index ad9105b..e9913e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-07-11 Catalin Marinas + * stgit/main.py (__resolved): Run git-update-cache for the + resolved files + * gitmergeonefile.py: Fix the os.rename exception occurring when the checkout directory is not present