BGBM BDI Projects / taxeditor.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7bc0185) | patch
Add files to ignore on merge conflict if the 'ours' driver is configured
authorCherian Mathew <c.mathew@bgbm.org>
Fri, 9 Oct 2015 11:55:17 +0000 (13:55 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Fri, 9 Oct 2015 11:55:17 +0000 (13:55 +0200)
commit3cb0b24a1580129d391b0266b9cb44108b983b6d
tree4689ddcb327c1b03790d9bce6032973f88c81299tree | snapshot
parent7bc0185675b3cd634a16119272e7d09f8b1345e1commit | diff
Add files to ignore on merge conflict if the 'ours' driver is configured
.gitattributes diff | blob | history