|
Benjamin Poirier |
c8faf9 |
# This file is not automatically read by git. It must be included explicitly,
|
|
Benjamin Poirier |
c8faf9 |
# for instance via an include directive in the repository-specific
|
|
Benjamin Poirier |
c8faf9 |
# configuration file ($GIT_DIR/config). That directive should be added
|
|
Benjamin Poirier |
c8faf9 |
# automatically by scripts/install-git-hooks.
|
|
Benjamin Poirier |
c8faf9 |
[merge "rpm-changes"]
|
|
Benjamin Poirier |
c8faf9 |
name = *.changes merge driver
|
|
Benjamin Poirier |
c8faf9 |
driver = scripts/rpm-changes-merge.pl %A %O %B
|
|
Benjamin Poirier |
c8faf9 |
[diff "symsets"]
|
|
Benjamin Poirier |
c8faf9 |
textconv = scripts/list-symsets
|