diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-03-27 02:49:57 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-03-27 02:49:57 +0300 |
commit | ff4b32741acb36e8b2cf3d83fe0d513ad5753e59 (patch) | |
tree | aaa858045f6d7b8fe8f0920a31a26b5dff459c0d /mesonbuild/interpreter.py | |
parent | 1f63044f6e2e4ef884979a1552a76ee030f12ad1 (diff) | |
download | meson-ff4b32741acb36e8b2cf3d83fe0d513ad5753e59.zip meson-ff4b32741acb36e8b2cf3d83fe0d513ad5753e59.tar.gz meson-ff4b32741acb36e8b2cf3d83fe0d513ad5753e59.tar.bz2 |
Thank you git for silently discarding unrelated changes on conflicts. It is very helpful.
Diffstat (limited to 'mesonbuild/interpreter.py')
0 files changed, 0 insertions, 0 deletions