summaryrefslogtreecommitdiffstats
path: root/cochran.c
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-08-23 18:15:33 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-08-25 10:43:27 -0700
commit70c38de3a1880b5920fd799b0059518a79ca2acd (patch)
tree76a054cd4dc9d0b14c85359cb8fc6d7ac34b4439 /cochran.c
parenta45c5f1acf728d28449f00d6ed37d9449c9e0ee1 (diff)
downloadsubsurface-70c38de3a1880b5920fd799b0059518a79ca2acd.tar.gz
Cloud storage: be very strict about renames
Because of the structure of some of our files git too easily assumed that they were renames and that confused the merge algorithm. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'cochran.c')
0 files changed, 0 insertions, 0 deletions