aboutsummaryrefslogtreecommitdiff
path: root/contrib/merge_updates_unix.sh
diff options
context:
space:
mode:
authorWarpten <vertozor@gmail.com>2014-05-17 14:54:17 +0200
committerWarpten <vertozor@gmail.com>2014-05-17 14:54:17 +0200
commit488e4ef8e1f55aea3ac320390b4526c39ab4bfdb (patch)
treedb5e1e31c84a6f9b53d6fa4f5cf94382771fd935 /contrib/merge_updates_unix.sh
parent9d760098a5a1bf5203fce8e3ba7b462a7885ee75 (diff)
Contrib: Added an updated version of the configuration file merger tool.
This one lets you choose which value to keep between the two configuration files. Make sure to carefully read the file's lines 3 to 9 to make sure you don't misuse it and get back at me later raging. It is not exactly as I would like it to be, but current state will have to do. You can try it out live at: http://tinyurl.com/kzxmrlm
Diffstat (limited to 'contrib/merge_updates_unix.sh')
0 files changed, 0 insertions, 0 deletions