summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-03-30 20:20:16 -0500
committerDan McGee <dan@archlinux.org>2011-03-30 20:20:16 -0500
commit3089c833ffa548d8965414d461bef023855dc34f (patch)
tree4ee66da72f50e2fc889b644ca8080d483592c0d6 /.gitattributes
parentd3d18a42d2a12f65c51dec34608921cec7b42068 (diff)
Unify filelist operation functions in conflict checking
We had two functions that were oh so similar but slightly different. We can combine them and add some conditional operation stuff to decide what to return. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions