tests/gpg/pubring.gpg
author Siddharth Agarwal <sid0@fb.com>
Mon, 01 Feb 2016 20:28:32 -0800
changeset 28020 cffa46cbdb8f
parent 8809 6fce36336e42
permissions -rw-r--r--
merge: tell _checkunknownfiles about whether this was merge --force In an upcoming patch we'll have different behavior here for when 'merge --force' is used as opposed to when other kinds of force operations are performed, like rebases.

(binary:application/octet-stream)