Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJason Chu <jchu@xentac.net>2008-04-20 13:29:40 -0700
committerJason Chu <jchu@xentac.net>2008-04-20 13:30:00 -0700
commit0b36e8ecb3b9ec4dba9e52d795d20dc8623bbd99 (patch)
tree157d678caccfa1fbdb8016b43882a1842899acbc /Makefile
parentf71a0fabb7770eb4319b33704f71b729142ed1fc (diff)
Add a message that explains what to do when a merge conflict is detected and needs to be dealt with.
Diffstat (limited to 'Makefile')
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.