Commit 63c3a344 authored by Guillaume Melquiond's avatar Guillaume Melquiond

Mark session files as being merged using the local version only.

These attributes have no effect by themselves. You have to type the
following command first:

git config --global merge.ours.driver true
parent c18ef498
......@@ -13,3 +13,6 @@
/misc/ export-ignore
/opam/ export-ignore
/tests/ export-ignore
why3session.xml merge=ours
why3shapes.gz merge=ours
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment