adding utility functions `git-keep-conflict-first` and `git-keep-conflict-second`
adding utility functions `git-keep-conflict-first` and `git-keep-conflict-second`

Wilfred/.emacs.d,Wilfred/.emacs.d,Wilfred/.emacs.d,Wilfred/.emacs.d,Wilfred/.emacs.d,Wilfred/.emacs.d,Wilfred/.emacs.d