Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2013-07-15 11:45:11 +1000
committerAllan McRae <allan@archlinux.org>2013-07-22 13:29:07 +1000
commit29498b6a2a67a9bc7b9648347b3bfbe5d9e92735 (patch)
tree9ac14d44637b4ae5531c70b1b07ab843d32c449b /test
parenta774e4d5e26f6e88ecf87237449cbbbe21df179f (diff)
Clarify inter-conflicts message
Use a clear message rather than using a made up word to describe what we are doing. Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'test')
0 files changed, 0 insertions, 0 deletions

Copyright © 2002-2022 Judd Vinet and Aaron Griffin. Copyright © 2022 Erich Eckner.
The Arch Linux name and logo are recognized trademarks. Some rights reserved. The registered trademark Linux® is used pursuant to a sublicense from LMI, the exclusive licensee of Linus Torvalds, owner of the mark on a world-wide basis.