History maint/git-conflicts.bash