summaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2020-11-26 17:33:53 +0100
committerPaul Lemire <paul.lemire@kdab.com>2020-12-01 15:44:55 +0100
commitd4e6ee2d994651ce17f7014ba1077ae4bd228cfb (patch)
treedd47ffa5c50155519a562dcb843651d948ca5fe4 /.gitattributes
parentc5845d67be03d0f1f538422ba1ad181442b09819 (diff)
Only set the state flag after having merged with the other states
Change-Id: Ic7a0a2cccb2b131eec7fca3cf7324109b4d22b6b Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 6df7098d89cf4a2eec35fe1362d354c91eb7a4ef)
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions