From: Sven Strickroth <email@cs-ware.de>
Date: Thu, 7 Feb 2013 23:41:18 +0000 (+0100)
Subject: Merge branch 'issue-1597'
X-Git-Tag: REL_1.8.2.0_EXTERNAL~207
X-Git-Url: https://repo.or.cz/w/TortoiseGit.git/commitdiff_plain/78a5bc4bd741987c14d8fe2dcb828bbca47dd3e0

Merge branch 'issue-1597'

(fixed issue #1597)

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---

78a5bc4bd741987c14d8fe2dcb828bbca47dd3e0
diff --cc src/Changelog.txt
index 12f55c1c3,12f55c1c3..fc3c78489
--- a/src/Changelog.txt
+++ b/src/Changelog.txt
@@@ -7,6 -7,6 +7,7 @@@ Released: unrelease
   * Can disable log cache (tortoisegit.data, tortoisegit.index)
   * Revision Graph can save as graphviz dot language (*.gv)
   * Support merge strategies except octopus
++ * Fixed issue #1597: Reduce chance of committing old submodule revision on cherry-pick / rebase conflicts
  
  = Release 1.8.1.0 =
  Released: 2013-02-07