[PATCH] contrib/nmbug: use "resolve" merge strategy
authordavid <david@tethera.net>
Sat, 31 Mar 2012 12:12:40 +0000 (09:12 +2100)
committerW. Trevor King <wking@tremily.us>
Fri, 7 Nov 2014 17:45:54 +0000 (09:45 -0800)
commit6b1a7eb89a6f8c47babf62e94ce7572fb2849c95
tree9432d1444488de144ee90242561a99df80f24897
parentcd986b4f0b6ba882c7d7a46788cc38178f943f6c
[PATCH] contrib/nmbug: use "resolve" merge strategy
33/a7f9846bb4759772e8b454bd225e095db690b8 [new file with mode: 0644]