Add a message that explains what to do when a merge conflict is detected and needs to be dealt with. - devtools32

diff options

author	Jason Chu <jchu@xentac.net>	2008-04-20 13:29:40 -0700
committer	Jason Chu <jchu@xentac.net>	2008-04-20 13:30:00 -0700
commit	0b36e8ecb3b9ec4dba9e52d795d20dc8623bbd99 (patch)
tree	157d678caccfa1fbdb8016b43882a1842899acbc /extrapkg
parent	f71a0fabb7770eb4319b33704f71b729142ed1fc (diff)

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