summaryrefslogtreecommitdiffstats
path: root/extrapkg
diff options
context:
space:
mode:
authorJason Chu <jchu@xentac.net>2008-04-20 22:29:40 +0200
committerJason Chu <jchu@xentac.net>2008-04-20 22:30:00 +0200
commit0b36e8ecb3b9ec4dba9e52d795d20dc8623bbd99 (patch)
tree157d678caccfa1fbdb8016b43882a1842899acbc /extrapkg
parentf71a0fabb7770eb4319b33704f71b729142ed1fc (diff)
downloaddevtools-0b36e8ecb3b9ec4dba9e52d795d20dc8623bbd99.tar.gz
devtools-0b36e8ecb3b9ec4dba9e52d795d20dc8623bbd99.tar.xz
Add a message that explains what to do when a merge conflict is detected and needs to be dealt with.
Diffstat (limited to 'extrapkg')
0 files changed, 0 insertions, 0 deletions