diff options
| author | Allan McRae <allan@archlinux.org> | 2013-07-15 11:45:11 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-07-22 13:29:07 +1000 |
| commit | 29498b6a2a67a9bc7b9648347b3bfbe5d9e92735 (patch) | |
| tree | 9ac14d44637b4ae5531c70b1b07ab843d32c449b /.gitattributes | |
| parent | a774e4d5e26f6e88ecf87237449cbbbe21df179f (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 '.gitattributes')
0 files changed, 0 insertions, 0 deletions