summaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2017-04-16 00:12:56 +0200
committerAndrew Gregory <andrew.gregory.8@gmail.com>2017-04-17 01:41:35 +0200
commit6d1dcf7937ba3739d17eda614591d1f59ac0bf3a (patch)
treecaa2ccc7815cc1c0dc95b36c20a0d4287f74a3ac /.gitattributes
parent16b91f798faf6413f9b043543c5c0c3467b6fdbf (diff)
downloadpacman-6d1dcf7937ba3739d17eda614591d1f59ac0bf3a.tar.gz
pacman-6d1dcf7937ba3739d17eda614591d1f59ac0bf3a.tar.xz
conflict: include owner for filesystem conflicts
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions